Allow all master dns nodes to send notifys

When deployed with mutliple masters the slave will reject notifys from them so explicitly list all masters who can send notifys. Minor fir to amulet test as designate no longer creates a default nameserver Change-Id: I60397375d3bda317b2b6acfcfc37686d73d1a855
openstack · Jul 27, 2016 · 32c5548 · 32c5548
1 parent 021c2a6
commit 32c5548
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
 # Requirements to build the charm
-ruamel.yaml==0.10.12
 simplejson
 flake8
diff --git a/src/templates/named.conf.options b/src/templates/named.conf.options
@@ -26,4 +26,5 @@ options {
         allow-new-zones yes;
         request-ixfr no;
         recursion no;
+        allow-notify { {{ dns_backend.control_ips }}; };
 };
diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
@@ -84,14 +84,15 @@ def _configure_services(self):
             keystone_config = {'admin-password': 'openstack',
                                'admin-token': 'ubuntutesting',
                                'openstack-origin': 'cloud:trusty-mitaka'}
-            designate_config = {'openstack-origin': 'cloud:trusty-mitaka'}
-            configs = {
-                'keystone': keystone_config,
-                'designate': designate_config}
+            designate_config = {'openstack-origin': 'cloud:trusty-mitaka',
+                                'nameservers': 'ns1.mojotest.com.'}
         else:
             keystone_config = {'admin-password': 'openstack',
                                'admin-token': 'ubuntutesting'}
-            configs = {'keystone': keystone_config}
+            designate_config = {'nameservers': 'ns1.mojotest.com.'}
+        configs = {
+            'keystone': keystone_config,
+            'designate': designate_config}
         super(DesignateBindDeployment, self)._configure_services(configs)
 
     def _get_token(self):