Muehlenhoff has submitted this change and it was merged. Change subject: Add salt grains for restbase ......................................................................
Add salt grains for restbase Change-Id: I18839298eb6c6ae989438bfae5a990ce79593021 --- M hieradata/role/codfw/restbase.yaml M hieradata/role/eqiad/restbase.yaml M modules/debdeploy/templates/debdeploy.erb 3 files changed, 11 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/codfw/restbase.yaml b/hieradata/role/codfw/restbase.yaml index 504efcf..74d14a2 100644 --- a/hieradata/role/codfw/restbase.yaml +++ b/hieradata/role/codfw/restbase.yaml @@ -8,3 +8,7 @@ lvs::realserver::realserver_ips: - '10.2.1.17' # restbase.svc.codfw.wmnet + +debdeploy::grains: + debdeploy-restbase-codfw: + value: standard diff --git a/hieradata/role/eqiad/restbase.yaml b/hieradata/role/eqiad/restbase.yaml index e352e91..0c17515 100644 --- a/hieradata/role/eqiad/restbase.yaml +++ b/hieradata/role/eqiad/restbase.yaml @@ -11,3 +11,7 @@ lvs::realserver::realserver_ips: - '10.2.2.17' # restbase.svc.eqiad.wmnet + +debdeploy::grains: + debdeploy-restbase-eqiad: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 38d9a46..a290ff1 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -18,3 +18,6 @@ hadoop = debdeploy-hadoop-worker:standard, debdeploy-hadoop-master:standard, debdeploy-hadoop-standby:standard aqs = debdeploy-aqs:standard restbase-canary = debdeploy-restbase:canary +restbase-eqiad = debdeploy-restbase-eqiad:standard +restbase-codfw = debdeploy-restbase-codfw:standard +restbase = debdeploy-restbase-codfw:standard, debdeploy-restbase-eqiad:standard -- To view, visit https://gerrit.wikimedia.org/r/246951 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I18839298eb6c6ae989438bfae5a990ce79593021 Gerrit-PatchSet: 2 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
