Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/231406
Change subject: Replace some hardcoded labnet1001 refs with hiera values.
......................................................................
Replace some hardcoded labnet1001 refs with hiera values.
Bug: T99701
Change-Id: I67a6593336f4dd3d1f78119be8fc18e3c2a64d50
---
M hieradata/eqiad.yaml
M manifests/role/nova.pp
M modules/openstack/manifests/controller_firewall.pp
3 files changed, 12 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/231406/1
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index af9585d..738bb51 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -64,6 +64,10 @@
labs_dns_host: "labs-ns2.wikimedia.org"
labs_recursor: "labs-recursor0.wikimedia.org"
+labs_nova_network_host: "labnet1001"
+labs_nova_network_ip: "10.64.20.13"
+labs_nova_api_host: "labnet1001.eqiad.wmnet"
+
# Eventlogging
eventlogging_host: 10.64.32.167
labs_certmanager_hostname: "holmium.wikimedia.org"
diff --git a/manifests/role/nova.pp b/manifests/role/nova.pp
index 603a1db4e..9f4ce66 100644
--- a/manifests/role/nova.pp
+++ b/manifests/role/nova.pp
@@ -103,21 +103,21 @@
flat_network_bridge => 'br1102',
network_public_interface => 'eth0',
network_host => $::realm ? {
- 'production' => '10.64.20.13',
+ 'production' => hiera('labs_nova_network_ip'),
'labs' => $nova_network_hostname ? {
undef => $::ipaddress_eth0,
default => $nova_network_hostname,
}
},
api_host => $::realm ? {
- 'production' => 'labnet1001.eqiad.wmnet',
+ 'production' => hiera('labs_nova_api_host')
'labs' => $nova_controller_hostname ? {
undef => $::ipaddress_eth0,
default => $nova_controller_hostname,
}
},
api_ip => $::realm ? {
- 'production' => '10.64.20.13',
+ 'production' => ipresolve(hiera('labs_nova_api_host'),4),
'labs' => $nova_controller_ip ? {
undef => $::ipaddress_eth0,
default => $nova_controller_ip,
@@ -209,21 +209,21 @@
flat_network_bridge => 'br1102',
network_public_interface => 'eth0',
network_host => $::realm ? {
- 'production' => '10.64.20.13',
+ 'production' => hiera('labs_nova_network_ip'),
'labs' => $nova_network_hostname ? {
undef => $::ipaddress_eth0,
default => $nova_network_hostname,
}
},
api_host => $::realm ? {
- 'production' => 'labnet1001.eqiad.wmnet',
+ 'production' => hiera('labs_nova_api_host'),
'labs' => $nova_controller_hostname ? {
undef => $::ipaddress_eth0,
default => $nova_controller_hostname,
}
},
api_ip => $::realm ? {
- 'production' => '10.64.20.13',
+ 'production' => ipresolve(hiera('labs_nova_api_host'),4),
'labs' => $nova_controller_ip ? {
undef => $::ipaddress_eth0,
default => $nova_controller_ip,
@@ -264,7 +264,7 @@
keystone_auth_protocol => $keystoneconfig['auth_protocol'],
keystone_auth_port => $keystoneconfig['auth_port'],
}
- if ( $::hostname == 'labnet1001' ) {
+ if ( $::hostname == hiera('labs_nova_network_host') ) {
$networkconfig = {
network_flat_interface => 'eth1.1102',
network_flat_tagged_base_interface => 'eth1',
diff --git a/modules/openstack/manifests/controller_firewall.pp
b/modules/openstack/manifests/controller_firewall.pp
index 0e7dac3..245b695 100644
--- a/modules/openstack/manifests/controller_firewall.pp
+++ b/modules/openstack/manifests/controller_firewall.pp
@@ -4,7 +4,7 @@
$labs_vms = '10.68.16.0/21'
$wikitech = '208.80.154.136'
$horizon = '208.80.154.147'
- $api_host = ipresolve('labnet1001.eqiad.wmnet',4)
+ $api_host = ipresolve(('labs_nova_api_host'),4)
$other_master = ipresolve(hiera('labs_nova_controller_other'),4)
$spare_master = ipresolve(hiera('labs_nova_controller_spare'),4)
$monitoring = '208.80.154.14'
--
To view, visit https://gerrit.wikimedia.org/r/231406
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67a6593336f4dd3d1f78119be8fc18e3c2a64d50
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
