Muehlenhoff has submitted this change and it was merged. Change subject: Assign salt grains for bastion hosts ......................................................................
Assign salt grains for bastion hosts Change-Id: I67cd84717fa4e9aa15606ea5ac01cf014903b8a4 --- M hieradata/role/common/bastionhost/general.yaml A hieradata/role/common/bastionhost/opsonly.yaml M modules/debdeploy/templates/debdeploy.erb 3 files changed, 8 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/role/common/bastionhost/general.yaml b/hieradata/role/common/bastionhost/general.yaml index 9280a66..3375d73 100644 --- a/hieradata/role/common/bastionhost/general.yaml +++ b/hieradata/role/common/bastionhost/general.yaml @@ -12,3 +12,6 @@ - parsoid-admin - ocg-render-admins - bastiononly +debdeploy::grains: + debdeploy-bastion: + value: standard diff --git a/hieradata/role/common/bastionhost/opsonly.yaml b/hieradata/role/common/bastionhost/opsonly.yaml new file mode 100644 index 0000000..f9124ed --- /dev/null +++ b/hieradata/role/common/bastionhost/opsonly.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-bastion: + value: canary diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 96b257e..891e691 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -34,3 +34,5 @@ eventlogging = debdeploy-eventlogging:standard ganeti = debdeploy-ganeti:standard ganeti-canary = debdeploy-ganeti:canary +bastion = debdeploy-bastion:standard +bastion-canary = debdeploy-bastion:canary -- To view, visit https://gerrit.wikimedia.org/r/247550 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I67cd84717fa4e9aa15606ea5ac01cf014903b8a4 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
