Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195544
Change subject: dsh: Allow setting group source via hiera
......................................................................
dsh: Allow setting group source via hiera
Change-Id: I78d7bc8209cb6e43ce6c3cec0dbcc8e299ca1c44
---
M hieradata/labs/deployment-prep/common.yaml
M modules/dsh/manifests/config.pp
2 files changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/195544/1
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 8f57793..e1371ac 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -131,3 +131,4 @@
"role::url_downloader::url_downloader_ip": 10.68.16.135
"zotero::http_proxy": deployment-urldownloader.eqiad.wmflabs:8080
"role::trebuchet::deployment_server": deployment-bastion.eqiad.wmflabs
+"dsh::config::group_source": 'puppet:///modules/beta/dsh/group'
diff --git a/modules/dsh/manifests/config.pp b/modules/dsh/manifests/config.pp
index b9e1ed2..78963f1 100644
--- a/modules/dsh/manifests/config.pp
+++ b/modules/dsh/manifests/config.pp
@@ -2,7 +2,10 @@
#
# Sets up dsh config files alone, without actually
# setting up dsh. Useful primarily for monitoring
-class dsh::config ($scap_proxies = []){
+class dsh::config (
+ $group_source = 'puppet:///modules/dsh/group',
+ $scap_proxies = [],
+){
file { '/etc/dsh':
ensure => directory,
owner => 'root',
@@ -13,7 +16,7 @@
owner => 'root',
group => 'root',
mode => '0444',
- source => 'puppet:///modules/dsh/group',
+ source => $group_source,
recurse => true,
}
--
To view, visit https://gerrit.wikimedia.org/r/195544
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78d7bc8209cb6e43ce6c3cec0dbcc8e299ca1c44
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
