Muehlenhoff has submitted this change and it was merged. Change subject: Assign salt grains for logstash ......................................................................
Assign salt grains for logstash Change-Id: Ib286b93e23768f43c8b1b263259a2bf51c3b3358 --- A hieradata/hosts/logstash1001.yaml M hieradata/role/common/logstash.yaml M modules/debdeploy/templates/debdeploy.erb 3 files changed, 9 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/hosts/logstash1001.yaml b/hieradata/hosts/logstash1001.yaml new file mode 100644 index 0000000..e99cedb --- /dev/null +++ b/hieradata/hosts/logstash1001.yaml @@ -0,0 +1,3 @@ +debdeploy::grains: + debdeploy-logstash: + value: canary diff --git a/hieradata/role/common/logstash.yaml b/hieradata/role/common/logstash.yaml index 82630d2..cc9a407 100644 --- a/hieradata/role/common/logstash.yaml +++ b/hieradata/role/common/logstash.yaml @@ -52,3 +52,7 @@ - cn=ops,ou=groups,dc=wikimedia,dc=org - cn=nda,ou=groups,dc=wikimedia,dc=org - cn=wmf,ou=groups,dc=wikimedia,dc=org + +debdeploy::grains: + debdeploy-logstash: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index 8fef3d1..71256b8 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -41,3 +41,5 @@ elastic-codfw = debdeploy-elastic-codfw:standard elastic = debdeploy-elastic-eqiad:standard, debdeploy-elastic-codfw:standard logging = debdeploy-logging:standard +logstash-canary = debdeploy-logstash:canary +logstash = debdeploy-logstash:standard -- To view, visit https://gerrit.wikimedia.org/r/247879 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib286b93e23768f43c8b1b263259a2bf51c3b3358 Gerrit-PatchSet: 3 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
