Muehlenhoff has submitted this change and it was merged. Change subject: Add salt grains for openldap::labs and extend openldap server group for debdeploy ......................................................................
Add salt grains for openldap::labs and extend openldap server group for debdeploy Change-Id: I64d038af125086e6b2503739d9cd2e535be5ec5a --- A hieradata/role/common/openldap/labs.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/openldap/labs.yaml b/hieradata/role/common/openldap/labs.yaml new file mode 100644 index 0000000..418d184 --- /dev/null +++ b/hieradata/role/common/openldap/labs.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-openldap-labs: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index c2d8feb..f210745 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -130,8 +130,8 @@ mw = debdeploy-appserver-codfw:standard, debdeploy-appserver-eqiad:standard, debdeploy-appserver:single_canary, debdeploy-appserver-eqiad:canary mw-canary = debdeploy-appserver-eqiad:canary mw-canary-single = debdeploy-appserver:single_canary -openldap-corp = debdeploy-openldap-corp:standard, debdeploy-openldap-corp:canary -openldap-corp-canary = debdeploy-openldap-corp:canary +openldap = debdeploy-openldap-corp:standard, debdeploy-openldap-corp:canary, debdeploy-openldap-labs:standard +openldap-canary = debdeploy-openldap-corp:canary cp-eqiad = debdeploy-cp-eqiad-maps:standard, debdeploy-cp-eqiad-misc:standard, debdeploy-cp-eqiad-mobile:standard, debdeploy-cp-eqiad-parsoid:standard ,debdeploy-cp-eqiad-text:standard, debdeploy-cp-eqiad-upload:standard cp-codfw = debdeploy-cp-codfw-mobile:standard, debdeploy-cp-codfw-parsoid:standard, debdeploy-cp-codfw-text:standard, debdeploy-cp-codfw-upload:standard cp-esams = debdeploy-cp-esams-mobile:standard, debdeploy-cp-esams-text:standard, debdeploy-cp-esams-upload:standard -- To view, visit https://gerrit.wikimedia.org/r/264076 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64d038af125086e6b2503739d9cd2e535be5ec5a 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
