Merge "Add opendev nameservers (2/2)"

This commit is contained in:
Zuul 2018-10-31 16:35:52 +00:00 committed by Gerrit Code Review
commit c488c48a9e

View File

@ -766,7 +766,7 @@ node /^adns\d+\.opendev\.org$/ {
class { 'openstack_project::master_nameserver': class { 'openstack_project::master_nameserver':
tsig_key => hiera('tsig_key', {}), tsig_key => hiera('tsig_key', {}),
dnssec_keys => hiera_hash('dnssec_keys', {}), dnssec_keys => hiera_hash('dnssec_keys', {}),
notifies => [], notifies => ['104.239.140.165', '162.253.55.16'],
} }
} }
@ -822,12 +822,12 @@ node /^ns\d+\.opendev\.org$/ {
class { '::nsd': class { '::nsd':
ip_addresses => [ $::ipaddress, $::ipaddress6 ], ip_addresses => [ $::ipaddress, $::ipaddress6 ],
zones => { zones => {
# 'adns1_zones' => { 'adns1_zones' => {
# allow_notify => dns_a('adns1.opendev.org'), allow_notify => ['104.239.146.24'],
# masters => dns_a('adns1.opendev.org'), masters => ['104.239.146.24'],
# zones => ['opendev.org'], zones => ['opendev.org'],
# tsig_name => $tsig_name, tsig_name => $tsig_name,
# } }
} }
} }
} }