Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/256462
Change subject: Assign per-data Salt grains for debdeploy
......................................................................
Assign per-data Salt grains for debdeploy
Most of the Salt grain addressing occurs per-role, but there's also
widespread updates of tools without service impact which can better
be handled en gros. Define an additional Salt grain per data centre.
Bug: T111006
Change-Id: I8ea5c3db684dd3c0576b9a63163d1376835a4780
---
M hieradata/codfw.yaml
M hieradata/eqiad.yaml
M hieradata/esams.yaml
M hieradata/ulsfo.yaml
M modules/base/manifests/debdeploy.pp
5 files changed, 21 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/256462/1
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index d1a13c7..c00026c 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -39,3 +39,7 @@
- conf1001.eqiad.wmnet
- conf1002.eqiad.wmnet
- conf1003.eqiad.wmnet
+
+debdeploy::dc_grain:
+ debdeploy-dc-codfw:
+ value: standard
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 8ee040b..1913a12 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -108,3 +108,7 @@
pdns_db_name: 'pdns'
rabbit_host: *labsnovacontroller
controller_hostname: *labsnovacontroller
+
+debdeploy::dc_grain:
+ debdeploy-dc-eqiad:
+ value: standard
diff --git a/hieradata/esams.yaml b/hieradata/esams.yaml
index 030ef4d..eb36991 100644
--- a/hieradata/esams.yaml
+++ b/hieradata/esams.yaml
@@ -1 +1,4 @@
ganglia_aggregators: hooft.esams.wikimedia.org:11649
+debdeploy::dc_grain:
+ debdeploy-dc-esams:
+ value: standard
diff --git a/hieradata/ulsfo.yaml b/hieradata/ulsfo.yaml
index 1081ce0..222dfc3 100644
--- a/hieradata/ulsfo.yaml
+++ b/hieradata/ulsfo.yaml
@@ -1 +1,4 @@
ganglia_aggregators: bast4001.wikimedia.org:12649
+debdeploy::dc_grain:
+ debdeploy-dc-ulsfo:
+ value: standard
diff --git a/modules/base/manifests/debdeploy.pp
b/modules/base/manifests/debdeploy.pp
index ffa260d..f44afe3 100644
--- a/modules/base/manifests/debdeploy.pp
+++ b/modules/base/manifests/debdeploy.pp
@@ -14,4 +14,11 @@
if $grains != {} {
create_resources(salt::grain, $grains)
}
+
+ $dc_grain = hiera_hash('debdeploy::dc_grain', {})
+
+ if $dc_grain != {} {
+ create_resources(salt::grain, $dc_grain)
+ }
+
}
--
To view, visit https://gerrit.wikimedia.org/r/256462
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ea5c3db684dd3c0576b9a63163d1376835a4780
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff <mmuhlenh...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
