Merge "Don't configure BIND to listen on localhost"

ci/environments/scenario003-multinode-containers.yaml

@@ -79,6 +79,9 @@ parameter_defaults:
   ControllerExtraConfig:
     nova::compute::libvirt::services::libvirt_virt_type: qemu
     nova::compute::libvirt::libvirt_virt_type: qemu
+  ControllerIPs:
+    ctlplane:
+    - 192.168.24.251
   Debug: true
   DockerPuppetDebug: True
   # we don't deploy Swift so we switch to file backend.
@@ -108,7 +111,7 @@ parameter_defaults:
       # List out the nameservers for this pool. These are the actual BIND servers.
       # We use these to verify changes have propagated to all nameservers.
       nameservers:
-        - host: 127.0.0.1
+        - host: 192.168.24.251
           port: 53
 
       # List out the targets for this pool. For BIND there will be one
@@ -128,8 +131,8 @@ parameter_defaults:
 
           # BIND Configuration options
           options:
-            host: 127.0.0.1
+            host: 192.168.24.251
             port: 53
-            rndc_host: 127.0.0.1
+            rndc_host: 192.168.24.251
             rndc_port: 953
             rndc_key_file: /etc/rndc.key

environments/enable-designate.yaml

@@ -35,7 +35,7 @@ parameter_defaults:
       # List out the nameservers for this pool. These are the actual BIND servers.
       # We use these to verify changes have propagated to all nameservers.
       nameservers:
-        - host: 127.0.0.1
+        - host: 10.0.0.51
           port: 53
 
       # List out the targets for this pool. For BIND there will be one
@@ -50,14 +50,14 @@ parameter_defaults:
           # If you have multiple controllers you can add multiple masters
           # by running designate-mdns on them, and adding them here.
           masters:
-            - host: 127.0.0.1
+            - host: 10.0.0.51
               port: 5354
 
           # BIND Configuration options
           options:
-            host: 127.0.0.1
+            host: 10.0.0.51
             port: 53
-            rndc_host: 127.0.0.1
+            rndc_host: 172.17.0.251
             rndc_port: 953
             rndc_key_file: /etc/rndc.key
 

puppet/services/designate-worker.yaml

@@ -85,7 +85,7 @@ outputs:
             listen-on:
               str_replace:
                 template:
-                  "{ 127.0.0.1; %{hiera('$NETWORK')}; }"
+                  "{ %{hiera('$NETWORK')}; }"
                 params:
                   $NETWORK: {get_param: [ServiceNetMap, BINDNetwork]}
           tripleo::profile::base::designate::rndc_host:

sample-env-generator/enable-services.yaml

@@ -48,7 +48,7 @@ environments:
               # List out the nameservers for this pool. These are the actual BIND servers.
               # We use these to verify changes have propagated to all nameservers.
               nameservers:
-                - host: 127.0.0.1
+                - host: 10.0.0.51
                   port: 53
 
               # List out the targets for this pool. For BIND there will be one
@@ -63,13 +63,13 @@ environments:
                   # If you have multiple controllers you can add multiple masters
                   # by running designate-mdns on them, and adding them here.
                   masters:
-                    - host: 127.0.0.1
+                    - host: 10.0.0.51
                       port: 5354
 
                   # BIND Configuration options
                   options:
-                    host: 127.0.0.1
+                    host: 10.0.0.51
                     port: 53
-                    rndc_host: 127.0.0.1
+                    rndc_host: 172.17.0.251
                     rndc_port: 953
                     rndc_key_file: /etc/rndc.key