Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403590 )
Change subject: cumin: stop cross-referencing the puppetdb master
......................................................................
cumin: stop cross-referencing the puppetdb master
Also, it might make sense to use something different in the future.
Change-Id: I770e6f6793ee379538f35750dea284b9f005e1a1
---
M hieradata/role/common/cluster/management.yaml
M modules/profile/manifests/cumin/master.pp
2 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/cluster/management.yaml
b/hieradata/role/common/cluster/management.yaml
index c9f0069..71632dd 100644
--- a/hieradata/role/common/cluster/management.yaml
+++ b/hieradata/role/common/cluster/management.yaml
@@ -1,3 +1,5 @@
admin::groups:
- datacenter-ops
monitor_screens: false
+# TODO: use nihal in codfw?
+profile::cumin::master::puppetdb_host: nitrogen.eqiad.wmnet
diff --git a/modules/profile/manifests/cumin/master.pp
b/modules/profile/manifests/cumin/master.pp
index 1f0502d..dcf11aa 100644
--- a/modules/profile/manifests/cumin/master.pp
+++ b/modules/profile/manifests/cumin/master.pp
@@ -1,5 +1,5 @@
class profile::cumin::master (
- $puppetdb_host = hiera('puppetmaster::puppetdb::master'),
+ $puppetdb_host = hiera('profile::cumin::master::puppetdb_host'),
$datacenters = hiera('datacenters'),
) {
include passwords::phabricator
--
To view, visit https://gerrit.wikimedia.org/r/403590
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I770e6f6793ee379538f35750dea284b9f005e1a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Volans <rcocci...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
