Andrew Bogott has submitted this change and it was merged.
Change subject: openstack firewall: get designate host from hiera
......................................................................
openstack firewall: get designate host from hiera
Put the designate hostname into hiera, then use @resolve
in a ferm srange to resolve the IP. Avoid hardcoding IP
or hostname here inside the module.
Change-Id: Id864af1c173595b14282001c13268e3edcf9558a
---
M hieradata/codfw.yaml
M hieradata/eqiad.yaml
M modules/openstack/manifests/controller_firewall.pp
3 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 37e52a6..0af661a 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -45,6 +45,7 @@
labs_ldap_dns_host: "labs-ns1.wikimedia.org"
labs_ldap_dns_host_secondary: "labs-ns0.wikimedia.org"
labs_certmanager_hostname: "holmium.wikimedia.org"
+labs_designate_hostname: "holmium.wikimedia.org"
labs_nova_network_host: "labnet1002"
labs_nova_network_ip: "10.64.20.25"
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 04b4a25..83968c7 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -63,6 +63,7 @@
# These are the up-and-coming, better dns servers:
labs_dns_host: "labs-ns2.wikimedia.org"
labs_recursor: "labs-recursor0.wikimedia.org"
+labs_designate_hostname: "holmium.wikimedia.org"
labs_nova_network_host: "labnet1002"
labs_nova_network_ip: "10.64.20.25"
@@ -71,3 +72,4 @@
# Eventlogging
eventlogging_host: 10.64.32.167
labs_certmanager_hostname: "holmium.wikimedia.org"
+
diff --git a/modules/openstack/manifests/controller_firewall.pp
b/modules/openstack/manifests/controller_firewall.pp
index be12072..32a5967 100644
--- a/modules/openstack/manifests/controller_firewall.pp
+++ b/modules/openstack/manifests/controller_firewall.pp
@@ -7,15 +7,14 @@
$api_host = ipresolve(hiera('labs_nova_api_host'),4)
$other_master = ipresolve(hiera('labs_nova_controller_other'),4)
$spare_master = ipresolve(hiera('labs_nova_controller_spare'),4)
+ $designate = ipresolve(hiera('labs_designate_hostname'),4)
$monitoring = '208.80.154.14'
if ($::site == 'codfw') {
# TODO! codfw will need something
# like this when the ip range is assigned.
# $labs_nodes = '10.4.16.0/24'
- $designate = '208.80.154.12'
} elsif ($::site == 'eqiad') {
$labs_nodes = '10.64.20.0/24'
- $designate = '208.80.154.12'
}
--
To view, visit https://gerrit.wikimedia.org/r/201880
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id864af1c173595b14282001c13268e3edcf9558a
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: John F. Lewis <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
