Muehlenhoff has submitted this change and it was merged. Change subject: Assign salt grains for dbstore systems ......................................................................
Assign salt grains for dbstore systems These don't use the role keyword (and are not straightforward to convert since they instantiate parametrised classes), so define the Hiera values via regex.yaml Change-Id: I9e1c28a8698c76e508c7610a933d5afb48d3656f --- M hieradata/regex.yaml M modules/debdeploy/templates/debdeploy.erb 2 files changed, 6 insertions(+), 0 deletions(-) Approvals: Muehlenhoff: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index 3c2c7c8..330856c 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -244,3 +244,8 @@ # no trailing comma! ] swift_aux_partitions: ['/dev/sda3', '/dev/sdb3'] +debdeploy_dbstore: + __regex: !ruby/regexp /^dbstore[12]00[12]]\.(eqiad|codfw)\.wmnet$/ + debdeploy::grains: + debdeploy-db-dbstore: + value: standard diff --git a/modules/debdeploy/templates/debdeploy.erb b/modules/debdeploy/templates/debdeploy.erb index c7e898a..66ba0e5 100644 --- a/modules/debdeploy/templates/debdeploy.erb +++ b/modules/debdeploy/templates/debdeploy.erb @@ -116,3 +116,4 @@ mw-canary-single = debdeploy-appserver:single_canary openldap-corp = debdeploy-openldap-corp:standard openldap-corp-canary = debdeploy-openldap-corp:canary +debdeploy-db-dbstore = debdeploy-db-dbstore:standard -- To view, visit https://gerrit.wikimedia.org/r/250994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9e1c28a8698c76e508c7610a933d5afb48d3656f 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
