Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/184312
Change subject: puppet: use role, hiera in rcstream ...................................................................... puppet: use role, hiera in rcstream Change-Id: Ibfb20f080c9730c5bc19e6a71550190dcfe1e5ef Signed-off-by: Giuseppe Lavagetto <[email protected]> --- M hieradata/regex.yaml A hieradata/role/common/rcstream.yaml M manifests/role/rcstream.pp M manifests/site.pp 4 files changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/12/184312/1 diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 6e646de..f6d25d8 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -19,10 +19,6 @@ cluster: search nagios_group: lucene -rcs_eqiad: - __regex: !ruby/regexp /^rcs100[0-9]\.eqiad\.wmnet/ - cluster: rcstream - restbase_eqiad: __regex: !ruby/regexp /^(cerium|praseodymium|xenon)\.eqiad\.wmnet$/ mainrole: restbase diff --git a/hieradata/role/common/rcstream.yaml b/hieradata/role/common/rcstream.yaml new file mode 100644 index 0000000..6f9f675 --- /dev/null +++ b/hieradata/role/common/rcstream.yaml @@ -0,0 +1 @@ +cluster: rcstream diff --git a/manifests/role/rcstream.pp b/manifests/role/rcstream.pp index 28fa585..3072f5a 100644 --- a/manifests/role/rcstream.pp +++ b/manifests/role/rcstream.pp @@ -8,6 +8,10 @@ # class role::rcstream { include lvs::configuration + include standard + if $::realm == 'production' { + include admin + } system::role { 'role::rcstream': description => 'MediaWiki Recent Changes stream', diff --git a/manifests/site.pp b/manifests/site.pp index 6cd0163..38cacc9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -2218,9 +2218,7 @@ } $ganglia_aggregator = ( $::hostname == 'rcs1001' ) - include admin - include standard - include role::rcstream + role rcstream } # netflow machine (jkrauska) -- To view, visit https://gerrit.wikimedia.org/r/184312 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibfb20f080c9730c5bc19e6a71550190dcfe1e5ef Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
