Muehlenhoff has submitted this change and it was merged.

Change subject: Add salt grains for ocg
......................................................................


Add salt grains for ocg

Change-Id: Iba53357a15bf43e848f89fefc7f557c1f9b68ec8
---
M hieradata/role/common/ocg.yaml
M modules/debdeploy/templates/debdeploy.erb
2 files changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/role/common/ocg.yaml b/hieradata/role/common/ocg.yaml
index 3c71485..9dc77ee 100644
--- a/hieradata/role/common/ocg.yaml
+++ b/hieradata/role/common/ocg.yaml
@@ -2,3 +2,6 @@
 admin::groups:
   - ocg-render-admins
 role::ocg::tmpfs_size: '32G'
+debdeploy::grains:
+  debdeploy-ocg:
+    value: standard
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index 7f14be3..df52544 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -23,3 +23,4 @@
 restbase = debdeploy-restbase-codfw:standard, debdeploy-restbase-eqiad:standard
 etcd = debdeploy-etcd:standard
 mx = debdeploy-mx:standard
+ocg = debdeploy-ocg:standard

-- 
To view, visit https://gerrit.wikimedia.org/r/246955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba53357a15bf43e848f89fefc7f557c1f9b68ec8
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

Reply via email to