[MediaWiki-commits] [Gerrit] beta: vary deployment-bastion by ::site - change (operations/puppet)

2014-03-06 Thread coren (Code Review) 
coren has submitted this change and it was merged.

Change subject: beta: vary deployment-bastion by ::site
..


beta: vary deployment-bastion by ::site

I am recreating the betacluster on eqiad, need to get some hardcoded
deployment-bastion.pmtpa.wmflabs to use 'eqiad'.

Change-Id: I47fbf7576bfc61a35fb032f48db68a64e3b3b0f3
---
M manifests/misc/deployment.pp
M manifests/role/applicationserver.pp
M modules/base/manifests/init.pp
M modules/beta/files/monitor_fatals.rb
4 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 0a732f8..57c9a4d 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -370,14 +370,14 @@
mode= '0775',
}
} else {
-   $mw_rsync_host = 'deployment-bastion.pmtpa.wmflabs'
+   $mw_rsync_host = deployment-bastion.${::site}.wmflabs
 
-   $mw_carbon_host = 'deployment-bastion.pmtpa.wmflabs'
+   $mw_carbon_host = deployment-bastion.${::site}.wmflabs
$mw_carbon_port = 2003
 
 # The Apache directories must belong to the mwdeploy user known on
-# deployment-bastion.pmtpa.wmflabs. That is the instance used by
-# Jenkins to deploy and updte the code.
+# deployment-bastion.{eqiad,pmtpa}.wmflabs. They are the instances used
+# by Jenkins to deploy and updte the code.
 # Since /data/project is shared and 'mwdeploy' can have a different uid
 # on each instance, running owner = mwdeploy would change the UID and
 # break Jenkins job with some permission denied.
diff --git a/manifests/role/applicationserver.pp 
b/manifests/role/applicationserver.pp
index 4c20539..d6de9d9 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -18,7 +18,7 @@
 
$mediawiki_log_aggregator = $::realm ? {
'production' = 'fluorine.eqiad.wmnet:8420',
-   'labs'   = 'deployment-bastion.pmtpa.wmflabs:8420',
+   'labs'   = deployment-bastion.${::site}.wmflabs:8420,
}
 
class configuration::php {
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 891d751..d26bb7d 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -276,7 +276,7 @@
 # Per labs project syslog:
 case $::instanceproject {
 'deployment-prep': {
-$syslog_remote_real = 
'deployment-bastion.pmtpa.wmflabs'
+$syslog_remote_real = 
deployment-bastion.${::site}.wmflabs
 }
 default: {
 $syslog_remote_real = 'i-03a9.pmtpa.wmflabs:5544'
diff --git a/modules/beta/files/monitor_fatals.rb 
b/modules/beta/files/monitor_fatals.rb
index 353e7be..e27bd41 100755
--- a/modules/beta/files/monitor_fatals.rb
+++ b/modules/beta/files/monitor_fatals.rb
@@ -15,7 +15,7 @@
 
 The file at /data/project/logs/fatal.log on the deployment cluster has a new
 entry within the last twelve hours.  You should check it out by connecting on
-any instance on the beta cluster (ie: deployment-bastion.pmtpa.wmflabs ).
+any instance on the beta cluster (ie: deployment-bastion).
 
 You can also look at logstash:
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I47fbf7576bfc61a35fb032f48db68a64e3b3b0f3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] beta: vary deployment-bastion by ::site - change (operations/puppet)

2014-03-05 Thread Hashar (Code Review) 
Hashar has uploaded a new change for review.

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

Change subject: beta: vary deployment-bastion by ::site
..

beta: vary deployment-bastion by ::site

I am recreating the betacluster on eqiad, need to get some hardcoded
deployment-bastion.pmtpa.wmflabs to use 'eqiad'.

Change-Id: I47fbf7576bfc61a35fb032f48db68a64e3b3b0f3
---
M manifests/misc/deployment.pp
M manifests/role/applicationserver.pp
M modules/base/manifests/init.pp
M modules/beta/files/monitor_fatals.rb
4 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/82/116982/1

diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index 0a732f8..57c9a4d 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -370,14 +370,14 @@
mode= '0775',
}
} else {
-   $mw_rsync_host = 'deployment-bastion.pmtpa.wmflabs'
+   $mw_rsync_host = deployment-bastion.${::site}.wmflabs
 
-   $mw_carbon_host = 'deployment-bastion.pmtpa.wmflabs'
+   $mw_carbon_host = deployment-bastion.${::site}.wmflabs
$mw_carbon_port = 2003
 
 # The Apache directories must belong to the mwdeploy user known on
-# deployment-bastion.pmtpa.wmflabs. That is the instance used by
-# Jenkins to deploy and updte the code.
+# deployment-bastion.{eqiad,pmtpa}.wmflabs. They are the instances used
+# by Jenkins to deploy and updte the code.
 # Since /data/project is shared and 'mwdeploy' can have a different uid
 # on each instance, running owner = mwdeploy would change the UID and
 # break Jenkins job with some permission denied.
diff --git a/manifests/role/applicationserver.pp 
b/manifests/role/applicationserver.pp
index f0e370d..bdb82fe 100644
--- a/manifests/role/applicationserver.pp
+++ b/manifests/role/applicationserver.pp
@@ -18,7 +18,7 @@
 
$mediawiki_log_aggregator = $::realm ? {
'production' = 'fluorine.eqiad.wmnet:8420',
-   'labs'   = 'deployment-bastion.pmtpa.wmflabs:8420',
+   'labs'   = deployment-bastion.${::site}.wmflabs:8420,
}
 
class configuration::php {
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 891d751..d26bb7d 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -276,7 +276,7 @@
 # Per labs project syslog:
 case $::instanceproject {
 'deployment-prep': {
-$syslog_remote_real = 
'deployment-bastion.pmtpa.wmflabs'
+$syslog_remote_real = 
deployment-bastion.${::site}.wmflabs
 }
 default: {
 $syslog_remote_real = 'i-03a9.pmtpa.wmflabs:5544'
diff --git a/modules/beta/files/monitor_fatals.rb 
b/modules/beta/files/monitor_fatals.rb
index 353e7be..e27bd41 100755
--- a/modules/beta/files/monitor_fatals.rb
+++ b/modules/beta/files/monitor_fatals.rb
@@ -15,7 +15,7 @@
 
 The file at /data/project/logs/fatal.log on the deployment cluster has a new
 entry within the last twelve hours.  You should check it out by connecting on
-any instance on the beta cluster (ie: deployment-bastion.pmtpa.wmflabs ).
+any instance on the beta cluster (ie: deployment-bastion).
 
 You can also look at logstash:
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I47fbf7576bfc61a35fb032f48db68a64e3b3b0f3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr

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