[MediaWiki-commits] [Gerrit] Assign salt grains for jobrunners - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/248844

Change subject: Assign salt grains for jobrunners
..

Assign salt grains for jobrunners

Change-Id: Ib4fd0c1e28747018ff8b97cf390299171f16a587
---
A hieradata/role/codfw/mediawiki/jobrunner.yaml
A hieradata/role/eqiad/mediawiki/jobrunner.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/248844/1

diff --git a/hieradata/role/codfw/mediawiki/jobrunner.yaml 
b/hieradata/role/codfw/mediawiki/jobrunner.yaml
new file mode 100644
index 000..468ee36
--- /dev/null
+++ b/hieradata/role/codfw/mediawiki/jobrunner.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-jobrunner-codfw:
+value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/jobrunner.yaml 
b/hieradata/role/eqiad/mediawiki/jobrunner.yaml
new file mode 100644
index 000..956c50a
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/jobrunner.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-jobrunner-eqiad:
+value: standard
+
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index c243483..d6cce78 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -97,3 +97,7 @@
 mw-api = debdeploy-appserverapi-codfw:standard, 
debdeploy-appserverapi-eqiad:standard
 mw-api-canary = debdeploy-appserverapi-eqiad:canary
 mw-api-canary-single = debdeploy-appserverapi:single_canary
+jobrunner-eqiad = debdeploy-jobrunner-eqiad:standard
+jobrunner-codfw = debdeploy-jobrunner-codfw:standard
+jobrunner= debdeploy-jobrunner-codfw:standard, 
debdeploy-jobrunner-eqiad:standard
+jobrunner-canary = debdeploy-jobrunner-eqiad:canary

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib4fd0c1e28747018ff8b97cf390299171f16a587
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Assign salt grains for jobrunners - change (operations/puppet)

[Muehlenhoff (Code Review)]

Muehlenhoff has submitted this change and it was merged.

Change subject: Assign salt grains for jobrunners
..


Assign salt grains for jobrunners

Change-Id: Ib4fd0c1e28747018ff8b97cf390299171f16a587
---
A hieradata/role/codfw/mediawiki/jobrunner.yaml
A hieradata/role/eqiad/mediawiki/jobrunner.yaml
M modules/debdeploy/templates/debdeploy.erb
3 files changed, 12 insertions(+), 0 deletions(-)

Approvals:
  Muehlenhoff: Verified; Looks good to me, approved



diff --git a/hieradata/role/codfw/mediawiki/jobrunner.yaml 
b/hieradata/role/codfw/mediawiki/jobrunner.yaml
new file mode 100644
index 000..468ee36
--- /dev/null
+++ b/hieradata/role/codfw/mediawiki/jobrunner.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-jobrunner-codfw:
+value: standard
+
diff --git a/hieradata/role/eqiad/mediawiki/jobrunner.yaml 
b/hieradata/role/eqiad/mediawiki/jobrunner.yaml
new file mode 100644
index 000..956c50a
--- /dev/null
+++ b/hieradata/role/eqiad/mediawiki/jobrunner.yaml
@@ -0,0 +1,4 @@
+debdeploy::grains:
+  debdeploy-jobrunner-eqiad:
+value: standard
+
diff --git a/modules/debdeploy/templates/debdeploy.erb 
b/modules/debdeploy/templates/debdeploy.erb
index c243483..d6cce78 100644
--- a/modules/debdeploy/templates/debdeploy.erb
+++ b/modules/debdeploy/templates/debdeploy.erb
@@ -97,3 +97,7 @@
 mw-api = debdeploy-appserverapi-codfw:standard, 
debdeploy-appserverapi-eqiad:standard
 mw-api-canary = debdeploy-appserverapi-eqiad:canary
 mw-api-canary-single = debdeploy-appserverapi:single_canary
+jobrunner-eqiad = debdeploy-jobrunner-eqiad:standard
+jobrunner-codfw = debdeploy-jobrunner-codfw:standard
+jobrunner= debdeploy-jobrunner-codfw:standard, 
debdeploy-jobrunner-eqiad:standard
+jobrunner-canary = debdeploy-jobrunner-eqiad:canary

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4fd0c1e28747018ff8b97cf390299171f16a587
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits