Muehlenhoff has uploaded a new change for review. https://gerrit.wikimedia.org/r/250994
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(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/94/250994/1 diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml index d02c6e8..ce16ed8 100644 --- a/hieradata/regex.yaml +++ b/hieradata/regex.yaml @@ -228,3 +228,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 9d7ae63..37dcc4a 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: newchange Gerrit-Change-Id: I9e1c28a8698c76e508c7610a933d5afb48d3656f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Muehlenhoff <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
