Hashar has uploaded a new change for review.

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

Change subject: Switch primary deployment server from tin to mira
......................................................................

Switch primary deployment server from tin to mira

tin will be reimaged to Jessie. Switch the primary deployment server to
mira right now so we can figure out potential issues related to Jessie.

Update default values in all hiera() to avoid confusion.

Bug: T144578
Change-Id: I19cf521d5cd4ada6860ed780fe93b44028776107
---
M hieradata/common.yaml
M modules/role/manifests/deployment/salt_masters.pp
M modules/role/manifests/deployment/server.pp
M modules/trebuchet/manifests/init.pp
4 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/315205/1

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 7a3a716..2592115 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -425,4 +425,4 @@
       kafka2002.codfw.wmnet:
         id: 2002
 
-deployment_server: tin.eqiad.wmnet
+deployment_server: mira.codfw.wmnet
diff --git a/modules/role/manifests/deployment/salt_masters.pp 
b/modules/role/manifests/deployment/salt_masters.pp
index dcebd63..fe74070 100644
--- a/modules/role/manifests/deployment/salt_masters.pp
+++ b/modules/role/manifests/deployment/salt_masters.pp
@@ -1,7 +1,7 @@
 # === Class role::deployment::salt_masters
 # Installs deployment-related data to the salt master
 class role::deployment::salt_masters(
-    $deployment_server = hiera('deployment_server', 'tin.eqiad.wmnet'),
+    $deployment_server = hiera('deployment_server', 'mira.codfw.wmnet'),
 ) {
 
     $deployment_config = {
diff --git a/modules/role/manifests/deployment/server.pp 
b/modules/role/manifests/deployment/server.pp
index 48b115b..67a5845 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -85,7 +85,7 @@
         require => File['/srv/deployment'],
     }
 
-    $deployment_server = hiera('deployment_server', 'tin.eqiad.wmnet')
+    $deployment_server = hiera('deployment_server', 'mira.codfw.wmnet')
     class { '::deployment::redis':
         deployment_server => $deployment_server
     }
diff --git a/modules/trebuchet/manifests/init.pp 
b/modules/trebuchet/manifests/init.pp
index 9a0d9bc..77a004c 100644
--- a/modules/trebuchet/manifests/init.pp
+++ b/modules/trebuchet/manifests/init.pp
@@ -9,7 +9,7 @@
 ) {
     $trebuchet_master = $::realm ? {
         labs       => pick($deployment_server, 
"${::labsproject}-deploy.eqiad.wmflabs"),
-        default    => hiera('deployment_server','tin.eqiad.wmnet'),
+        default    => hiera('deployment_server','mira.codfw.wmnet'),
     }
 
     include ::trebuchet::packages

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19cf521d5cd4ada6860ed780fe93b44028776107
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

Reply via email to