Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/248327
Change subject: Assign salt grains for maps ...................................................................... Assign salt grains for maps Change-Id: Ib2ae51dbac89454c467582f23cfc4d4e8cfbd9c8 --- M hieradata/role/common/maps/master.yaml M hieradata/role/common/maps/slave.yaml M modules/debdeploy/templates/debdeploy.erb 3 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/27/248327/1 diff --git a/hieradata/role/common/maps/master.yaml b/hieradata/role/common/maps/master.yaml index e127df9..0f045aa 100644 --- a/hieradata/role/common/maps/master.yaml +++ b/hieradata/role/common/maps/master.yaml @@ -1,3 +1,6 @@ postgresql::master::pgversion: 9.4 postgresql::master::datadir: /srv/postgresql/9.4/main postgresql::master::includes: tuning.conf +debdeploy::grains: + debdeploy-maps-master: + value: standard diff --git a/hieradata/role/common/maps/slave.yaml b/hieradata/role/common/maps/slave.yaml index f2609a7..4454cb9 100644 --- a/hieradata/role/common/maps/slave.yaml +++ b/hieradata/role/common/maps/slave.yaml @@ -3,3 +3,6 @@ postgresql::slave::includes: tuning.conf # Defined in the private repo #postgresql::slave::replication_pass: justapass +debdeploy::grains: + debdeploy-maps-slave: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index ec8c9de..45d9969 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -78,3 +78,6 @@ parsoid-eqiad = debdeploy-parsoid-eqiad:standard parsoid-codfw = debdeploy-parsoid-codfw:standard parsoid-canary = debdeploy-parsoid-eqiad:canary, debdeploy-parsoid-codfw:canary +maps-master = debdeploy-maps-master:standard +maps-slave = debdeploy-maps-slave:standard +maps = debdeploy-maps-master:standard, debdeploy-maps-slave:standard -- To view, visit https://gerrit.wikimedia.org/r/248327 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2ae51dbac89454c467582f23cfc4d4e8cfbd9c8 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
