Muehlenhoff has submitted this change and it was merged. Change subject: Add salt grains for piwik role ......................................................................
Add salt grains for piwik role Change-Id: I64d94447d140b5575b3f2551e55efab14fb751c9 --- A hieradata/role/common/piwik.yaml M modules/debdeploy/templates/debdeploy.erb 2 files changed, 5 insertions(+), 2 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/piwik.yaml b/hieradata/role/common/piwik.yaml new file mode 100644 index 0000000..686f3e1 --- /dev/null +++ b/hieradata/role/common/piwik.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-piwik: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 21184a7..c2d8feb 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -5,14 +5,14 @@ [serverlists] # A list of servers, each defined by one or more Salt grains. If multiple grains # are specified, they're processed sequentially -misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, debdeploy-gitblit:standard, debdeploy-spare:standard, debdeploy-releases:standard, debdeploy-testsystem:standard, debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, debdeploy-phabricator:standard, debdeploy-nova-manager:standard, debdeploy-planet:standard, debdeploy-horizon:standard, debdeploy-grafana:standard, debdeploy-irc:standard, debdeploy-packagebuild:standard, debdeploy-racktables:standard, debdeploy-syslog:standard, debdeploy-ipv6relay:standard, debdeploy-archiva:standard, debdeploy-pmacct:standard, debdeploy-labmon:standard, debdeploy-nova-control:standard, debdeploy-bugzilla:standard, debdeploy-installserver:standard, debdeploy-xenon:standard, debdeploy-icinga:standard, debdeploy-kafkatee:standard, debdeploy-gerrit:standard, debdeploy-ganglia:standard, debdeploy-db-maintenance:standard, debdeploy-hue:standard, debdeploy-ci:standard, debdeploy-librenms:standard, debdeploy-graphite:standard +misc-servers = debdeploy-tor:standard, debdeploy-ve:standard, debdeploy-gitblit:standard, debdeploy-spare:standard, debdeploy-releases:standard, debdeploy-testsystem:standard, debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-otrs:standard, debdeploy-phabricator:standard, debdeploy-nova-manager:standard, debdeploy-planet:standard, debdeploy-horizon:standard, debdeploy-grafana:standard, debdeploy-irc:standard, debdeploy-packagebuild:standard, debdeploy-racktables:standard, debdeploy-syslog:standard, debdeploy-ipv6relay:standard, debdeploy-archiva:standard, debdeploy-pmacct:standard, debdeploy-labmon:standard, debdeploy-nova-control:standard, debdeploy-bugzilla:standard, debdeploy-installserver:standard, debdeploy-xenon:standard, debdeploy-icinga:standard, debdeploy-kafkatee:standard, debdeploy-gerrit:standard, debdeploy-ganglia:standard, debdeploy-db-maintenance:standard, debdeploy-hue:standard, debdeploy-ci:standard, debdeploy-librenms:standard, debdeploy-graphite:standard, debdeploy-piwik:standard misc-external-services = debdeploy-tor:standard, debdeploy-etherpad:standard, debdeploy-lists:standard, debdeploy-planet:standard, debdeploy-otrs:standard, debdeploy-ipv6relay:standard, debdeploy-people:standard, debdeploy-mysql-analytics:standard, debdeploy-nova-api:standard, debdeploy-impala:standard misc-monitoring = debdeploy-grafana:standard, debdeploy-syslog:standard, debdeploy-ganglia:standard, debdeploy-graphite:standard, debdeploy-labmon:standard, debdeploy-icinga:standard misc-virt = debdeploy-nova-control:standard, debdeploy-horizon:standard, debdeploy-nova-manager:standard, debdeploy-nova-api:standard, debdeploy-labsdns:standard, debdeploy-nodepool:standard misc-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, debdeploy-xenon:standard, debdeploy-mysql-analytics:standard, debdeploy-impala:standard, debdeploy-spark-worker:standard, debdeploy-stat:standard, debdeploy-stat:canary all-analytics = debdeploy-kafkatee:standard, debdeploy-hue:standard, debdeploy-xenon:standard, debdeploy-mysql-analytics:standard, debdeploy-impala:standard, debdeploy-spark-worker:standard, debdeploy-hadoop-worker:standard, debdeploy-hadoop-master:standard, debdeploy-hadoop-standby:standard, debdeploy-hadoop-worker:canary misc-others = debdeploy-spare:standard, debdeploy-testsystem:standard, debdeploy-labsnfs:standard -misc-devel = debdeploy-bugzilla:standard, debdeploy-ci:standard, debdeploy-gitblit:standard, debdeploy-releases:standard, debdeploy-ve:standard, debdeploy-irc:standard, debdeploy-phabricator:standard, debdeploy-gerrit:standard, debdeploy-archiva:standard, debdeploy-rcstream:standard, debdeploy-eventlogging:standard, debdeploy-deployment:standard +misc-devel = debdeploy-bugzilla:standard, debdeploy-ci:standard, debdeploy-gitblit:standard, debdeploy-releases:standard, debdeploy-ve:standard, debdeploy-irc:standard, debdeploy-phabricator:standard, debdeploy-gerrit:standard, debdeploy-archiva:standard, debdeploy-rcstream:standard, debdeploy-eventlogging:standard, debdeploy-deployment:standard, debdeploy-piwik:standard misc-ops = debdeploy-packagebuild:standard, debdeploy-racktables:standard, debdeploy-db-maintenance:standard, debdeploy-pmacct:standard, debdeploy-installserver:standard, debdeploy-librenms:standard, debdeploy-backup-storage:standard, debdeploy-ipsec-test:standard, debdeploy-tftpserver:standard deployment-servers = debdeploy-deployment:standard hadoop-worker = debdeploy-hadoop-worker:standard, debdeploy-hadoop-worker:canary -- To view, visit https://gerrit.wikimedia.org/r/264075 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64d94447d140b5575b3f2551e55efab14fb751c9 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff <[email protected]> Gerrit-Reviewer: Muehlenhoff <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
