Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Don't configure BIND to listen on localhost
Browse files Browse the repository at this point in the history
It isn't useful for much of anything in a production deployment
and it conflicts with the local DNS server in CI.

Change-Id: Ied3ecdc71bfdf9bb6439e2c9464aa01346e69226
Closes-Bug: 1795043
  • Loading branch information
cybertron committed Sep 28, 2018
1 parent 664da5f commit 9a69426
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 12 deletions.
9 changes: 6 additions & 3 deletions ci/environments/scenario003-multinode-containers.yaml
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions environments/enable-designate.yaml
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion puppet/services/designate-worker.yaml
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions sample-env-generator/enable-services.yaml
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 9a69426

Please sign in to comment.