Andrew Bogott has submitted this change and it was merged.
Change subject: Define the horizon and wikitech hostnames in hiera.
......................................................................
Define the horizon and wikitech hostnames in hiera.
This removes some hard-coding in the designate role class,
and should allow labtest horizin to access labtest designate.
Change-Id: I17d3b369a742972407233b093d90ee4efa1b6b17
---
M hieradata/codfw/labtest.yaml
M hieradata/eqiad.yaml
M modules/role/manifests/labs/openstack/designate.pp
3 files changed, 10 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/codfw/labtest.yaml b/hieradata/codfw/labtest.yaml
index 675b957..efbf504 100644
--- a/hieradata/codfw/labtest.yaml
+++ b/hieradata/codfw/labtest.yaml
@@ -12,6 +12,9 @@
labs_nova_controller: &labsnovacontroller "labtestcontrol2001.wikimedia.org"
labs_nova_controller_spare: &labsnovacontrollerspare
"labtestcontrol2001.wikimedia.org"
+labs_osm_host: "labtestwikitech.wikimedia.org"
+labs_horizon_host: "labtesthorizon.wikimedia.org"
+
labs_designate_hostname: &labsdesignatehostname
"labtestservices2001.wikimedia.org"
labs_designate_hostname_secondary: &labs_designate_hostname_secondary
"labtestservices2001.wikimedia.org"
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index a65b3e5..53a98c0 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -84,6 +84,9 @@
labs_puppet_master: &labspuppetmaster "labs-puppetmaster-eqiad.wikimedia.org"
labs_keystone_host: &labskeystonehost "labcontrol1001.wikimedia.org"
+labs_osm_host: "wikitech.wikimedia.org"
+labs_horizon_host: "horizon.wikimedia.org"
+
# These are the old, soon-to-be-phased-out dns servers:
labs_ldap_dns_host: &labsldapdnshost "labs-ns0.wikimedia.org"
labs_ldap_dns_host_secondary: &labsldapdnshostsecondary
"labs-ns1.wikimedia.org"
diff --git a/modules/role/manifests/labs/openstack/designate.pp
b/modules/role/manifests/labs/openstack/designate.pp
index bcfda37..2eef3d1 100644
--- a/modules/role/manifests/labs/openstack/designate.pp
+++ b/modules/role/manifests/labs/openstack/designate.pp
@@ -7,13 +7,15 @@
$keystone_host = hiera('labs_keystone_host')
$nova_controller = hiera('labs_nova_controller')
$designate_host = hiera('labs_designate_hostname')
+ $osm_host = hiera('labs_osm_host')
+ $horizon_host = hiera('labs_horizon_host')
$keystoneconfig = hiera_hash('keystoneconfig', {})
$designateconfig = hiera_hash('designateconfig', {})
$controller_ip = ipresolve($nova_controller,4)
- $horizon_ip = ipresolve('horizon.wikimedia.org',4)
- $wikitech_ip = ipresolve('wikitech.wikimedia.org',4)
+ $horizon_ip = ipresolve($horizon_host,4)
+ $wikitech_ip = ipresolve($osm_host,4)
$dnsconfig = hiera_hash('labsdnsconfig', {})
$dns_host = $dnsconfig['host']
--
To view, visit https://gerrit.wikimedia.org/r/275729
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I17d3b369a742972407233b093d90ee4efa1b6b17
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
