Muehlenhoff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/243142
Change subject: WIP: Hiera-based assignment of grains for debdeploy
......................................................................
WIP: Hiera-based assignment of grains for debdeploy
Also add two initial grains to test with.
Bug: T111006
Change-Id: I83c5bb03e341032a34de44f4108d3e46623554b0
---
M hieradata/role/common/gitblit.yaml
M hieradata/role/common/ve.yaml
M modules/base/manifests/debdeploy.pp
3 files changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/243142/1
diff --git a/hieradata/role/common/gitblit.yaml
b/hieradata/role/common/gitblit.yaml
index af20d47..ed89533 100644
--- a/hieradata/role/common/gitblit.yaml
+++ b/hieradata/role/common/gitblit.yaml
@@ -1,3 +1,6 @@
admin::groups:
- gerrit-root
- gerrit-admin
+debdeploy::grains:
+ debdeploy-gitblit:
+ value: standard
diff --git a/hieradata/role/common/ve.yaml b/hieradata/role/common/ve.yaml
index 7bddf05a..d400f68 100644
--- a/hieradata/role/common/ve.yaml
+++ b/hieradata/role/common/ve.yaml
@@ -1,2 +1,5 @@
admin::groups:
- chromium-admin
+debdeploy::grains:
+ debdeploy-ve:
+ value: standard
diff --git a/modules/base/manifests/debdeploy.pp
b/modules/base/manifests/debdeploy.pp
index 758587d..0c062c0 100644
--- a/modules/base/manifests/debdeploy.pp
+++ b/modules/base/manifests/debdeploy.pp
@@ -8,4 +8,7 @@
package { 'debdeploy-minion':
ensure => present,
}
+
+ $grains = hiera_hash('debdeploy::grains')
+ create_resources(salt::grain, $grains)
}
--
To view, visit https://gerrit.wikimedia.org/r/243142
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83c5bb03e341032a34de44f4108d3e46623554b0
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
