Andrew Bogott has submitted this change and it was merged.
Change subject: Move certmanager hostname configuration to hiera
......................................................................
Move certmanager hostname configuration to hiera
remote_cert_cleaner parameter of puppetmaster::certmanager class is
assigned the value of designate_hostname which in both eqiad and codfw
is right now holmium. Move that configuration to hiera. As a result
role::nova::config is no longer is needed. Remove it from
role::puppet::server::labs
Change-Id: I095516c459b935d2abe88f64f7b7cce1d186ec7f
---
M hieradata/codfw.yaml
M hieradata/eqiad.yaml
M manifests/role/puppet.pp
3 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index e04dbeb..33601f4 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -35,4 +35,4 @@
labs_keystone_host: "labcontrol2001.wikimedia.org"
labs_ldap_dns_host: "labs-ns1.wikimedia.org"
labs_ldap_dns_host_secondary: "labs-ns0.wikimedia.org"
-labs_recursor: "labs-recursor0.wikimedia.org"
+labs_certmanager_hostname: "holmium.wikimedia.org"
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 7b63c64..1d141e1 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -47,3 +47,4 @@
# Eventlogging
eventlogging_host: 10.64.32.167
+labs_certmanager_hostname: "holmium.wikimedia.org"
diff --git a/manifests/role/puppet.pp b/manifests/role/puppet.pp
index e97244a..eab7789 100644
--- a/manifests/role/puppet.pp
+++ b/manifests/role/puppet.pp
@@ -8,10 +8,7 @@
$network::constants::all_network_subnets['production']['eqiad']['private']['labs-instances1-d-eqiad']['ipv4'],
]
- include role::nova::config
include ldap::role::config::labs
- $novaconfig = $role::nova::config::novaconfig
-
$ldapconfig = $ldap::role::config::labs::ldapconfig
$basedn = $ldapconfig['basedn']
@@ -39,7 +36,7 @@
if ! defined(Class['puppetmaster::certmanager']) {
class { 'puppetmaster::certmanager':
- remote_cert_cleaner => $novaconfig['designate_hostname'],
+ remote_cert_cleaner => hiera('labs_certmanager_hostname'),
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/214640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I095516c459b935d2abe88f64f7b7cce1d186ec7f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
