Rush has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/384587 )
Change subject: openstack: reuse canonical pdns values for nova network
......................................................................
openstack: reuse canonical pdns values for nova network
Bug: T171494
Change-Id: I51099f77a993344b13ab6f0d0419c47288d73dff
---
D hieradata/codfw/profile/openstack/labtest/nova/network.yaml
D hieradata/codfw/profile/openstack/labtestn/nova/network.yaml
M hieradata/eqiad/profile/openstack/main/nova/network.yaml
M modules/profile/manifests/openstack/base/nova/network/service.pp
M modules/profile/manifests/openstack/labtest/nova/network/service.pp
M modules/profile/manifests/openstack/main/nova/network/service.pp
6 files changed, 6 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/384587/1
diff --git a/hieradata/codfw/profile/openstack/labtest/nova/network.yaml
b/hieradata/codfw/profile/openstack/labtest/nova/network.yaml
deleted file mode 100644
index b4886c2..0000000
--- a/hieradata/codfw/profile/openstack/labtest/nova/network.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-profile::openstack::labtest::nova::network::dns_recursor:
'labtest-recursor0.wikimedia.org'
-profile::openstack::labtest::nova::network::dns_recursor_secondary:
'labtest-recursor0.wikimedia.org'
diff --git a/hieradata/codfw/profile/openstack/labtestn/nova/network.yaml
b/hieradata/codfw/profile/openstack/labtestn/nova/network.yaml
deleted file mode 100644
index d4f290e..0000000
--- a/hieradata/codfw/profile/openstack/labtestn/nova/network.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-profile::openstack::labtestn::nova::network::dns_recursor:
'labtest-recursor0.wikimedia.org'
-profile::openstack::labtestn::nova::network::dns_recursor_secondary:
'labtest-recursor0.wikimedia.org'
diff --git a/hieradata/eqiad/profile/openstack/main/nova/network.yaml
b/hieradata/eqiad/profile/openstack/main/nova/network.yaml
index 2b7edc6..bdb867d 100644
--- a/hieradata/eqiad/profile/openstack/main/nova/network.yaml
+++ b/hieradata/eqiad/profile/openstack/main/nova/network.yaml
@@ -4,9 +4,6 @@
'IPv4': 10.68.16.2
'project': wikitextexp
-profile::openstack::main::nova::network::dns_recursor:
'labs-recursor0.wikimedia.org'
-profile::openstack::main::nova::network::dns_recursor_secondary:
'labs-recursor1.wikimedia.org'
-
# A wide variety of hosts are reachable via a public web proxy
profile::openstack::main::nova::network::nova_dnsmasq_aliases:
deployment-cache-text04:
diff --git a/modules/profile/manifests/openstack/base/nova/network/service.pp
b/modules/profile/manifests/openstack/base/nova/network/service.pp
index 31a25d5..527d5c7 100644
--- a/modules/profile/manifests/openstack/base/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/network/service.pp
@@ -3,8 +3,8 @@
$nova_network_host = hiera('profile::openstack::base::nova_network_host'),
$labs_metal = hiera('profile::openstack::base::nova::network::labs_metal'),
$nova_dnsmasq_aliases =
hiera('profile::openstack::base::nova::network::nova_dnsmasq_aliases'),
- $dns_recursor =
hiera('profile::openstack::base::nova::network::dns_recursor'),
- $dns_recursor_secondary =
hiera('profile::openstack::base::nova::network::dns_recursor_secondary'),
+ $dns_recursor = hiera('profile::openstack::base::pdns::recursor'),
+ $dns_recursor_secondary =
hiera('profile::openstack::base::pdns::recursor_secondary'),
$network_flat_interface =
hiera('profile::openstack::base::nova::network_flat_interface'),
$network_flat_tagged_base_interface =
hiera('profile::openstack::base::nova::network_flat_tagged_base_interface'),
$network_flat_interface_vlan =
hiera('profile::openstack::base::nova::network_flat_interface_vlan'),
diff --git
a/modules/profile/manifests/openstack/labtest/nova/network/service.pp
b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
index 8e44171..d75b84c 100644
--- a/modules/profile/manifests/openstack/labtest/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/labtest/nova/network/service.pp
@@ -1,8 +1,8 @@
class profile::openstack::labtest::nova::network::service(
$version = hiera('profile::openstack::labtest::version'),
$nova_network_host =
hiera('profile::openstack::labtest::nova_network_host'),
- $dns_recursor =
hiera('profile::openstack::labtest::nova::network::dns_recursor'),
- $dns_recursor_secondary =
hiera('profile::openstack::labtest::nova::network::dns_recursor_secondary'),
+ $dns_recursor = hiera('profile::openstack::labtest::pdns::recursor'),
+ $dns_recursor_secondary =
hiera('profile::openstack::labtest::pdns::recursor_secondary'),
$network_flat_interface =
hiera('profile::openstack::labtest::nova::network_flat_interface'),
$network_flat_tagged_base_interface =
hiera('profile::openstack::labtest::nova::network_flat_tagged_base_interface'),
$network_flat_interface_vlan =
hiera('profile::openstack::labtest::nova::network_flat_interface_vlan'),
diff --git a/modules/profile/manifests/openstack/main/nova/network/service.pp
b/modules/profile/manifests/openstack/main/nova/network/service.pp
index 7f75f07..ef289dc 100644
--- a/modules/profile/manifests/openstack/main/nova/network/service.pp
+++ b/modules/profile/manifests/openstack/main/nova/network/service.pp
@@ -3,8 +3,8 @@
$nova_network_host = hiera('profile::openstack::main::nova_network_host'),
$labs_metal = hiera('profile::openstack::main::nova::network::labs_metal'),
$nova_dnsmasq_aliases =
hiera('profile::openstack::main::nova::network::nova_dnsmasq_aliases'),
- $dns_recursor =
hiera('profile::openstack::main::nova::network::dns_recursor'),
- $dns_recursor_secondary =
hiera('profile::openstack::main::nova::network::dns_recursor_secondary'),
+ $dns_recursor = hiera('profile::openstack::main::pdns::recursor'),
+ $dns_recursor_secondary =
hiera('profile::openstack::main::pdns::recursor_secondary'),
$network_flat_interface =
hiera('profile::openstack::main::nova::network_flat_interface'),
$network_flat_tagged_base_interface =
hiera('profile::openstack::main::nova::network_flat_tagged_base_interface'),
$network_flat_interface_vlan =
hiera('profile::openstack::main::nova::network_flat_interface_vlan'),
--
To view, visit https://gerrit.wikimedia.org/r/384587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51099f77a993344b13ab6f0d0419c47288d73dff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
