Muehlenhoff has submitted this change and it was merged.

Change subject: beta: switch deploy server to deployment-mira
......................................................................


beta: switch deploy server to deployment-mira

It is jessie, deployment-tin is going to be deleted and rebuild as a
Jessie host.

Duplicate deployment-tin hiera settings to tweak HHVM and prevent it
from emitting the 'Lightweight process exited'. Comes from wikitech:
https://wikitech.wikimedia.org/wiki/Hiera:Deployment-prep/host/deployment-tin

Bug: T144578
Change-Id: I3a1238916db0048f537ef57e2ded28941537abed
---
M hieradata/labs/deployment-prep/common.yaml
A hieradata/labs/deployment-prep/host/deployment-mira.yaml
M hieradata/labs/deployment-prep/host/deployment-tin.yaml
M modules/beta/manifests/config.pp
M modules/beta/manifests/deployaccess.pp
M modules/role/manifests/beta/trebuchet_testing.pp
M modules/scap/manifests/init.pp
7 files changed, 19 insertions(+), 10 deletions(-)

Approvals:
  Thcipriani: Looks good to me, but someone else must approve
  Muehlenhoff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index dd379ef..ac811c7 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -142,7 +142,7 @@
 "cxserver::yandex_url": https://translate.yandex.net
 "cxserver::registry": registry.yaml
 role::deployment::mediawiki::key_fingerprint: 
f0:54:06:fa:17:27:97:a2:cc:69:a0:a7:df:4c:0a:e3
-"role::deployment::salt_masters::deployment_server": 
deployment-tin.eqiad.wmflabs
+"role::deployment::salt_masters::deployment_server": 
deployment-mira.eqiad.wmflabs
 "hhvm::extra::fcgi":
     hhvm:
         pcre_cache_type: lru
@@ -161,9 +161,9 @@
 "beta::syncsiteresources::user": www-data
 "role::url_downloader::url_downloader_ip": 10.68.16.135 # 
deployment-urldownloader
 "zotero::http_proxy": 
deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080
-deployment_server: deployment-tin.deployment-prep.eqiad.wmflabs
-"trebuchet::deployment_server": deployment-tin.deployment-prep.eqiad.wmflabs
-"scap::deployment_server": deployment-tin.deployment-prep.eqiad.wmflabs
+deployment_server: deployment-mira.deployment-prep.eqiad.wmflabs
+"trebuchet::deployment_server": deployment-mira.deployment-prep.eqiad.wmflabs
+"scap::deployment_server": deployment-mira.deployment-prep.eqiad.wmflabs
 
 scap::dsh::scap_masters:
     - deployment-tin.deployment-prep.eqiad.wmflabs
diff --git a/hieradata/labs/deployment-prep/host/deployment-mira.yaml 
b/hieradata/labs/deployment-prep/host/deployment-mira.yaml
new file mode 100644
index 0000000..a138e89
--- /dev/null
+++ b/hieradata/labs/deployment-prep/host/deployment-mira.yaml
@@ -0,0 +1,6 @@
+---
+mount_nfs: false
+"hhvm::extra::cli":
+    hhvm:
+        server:
+            light_process_count: 0
diff --git a/hieradata/labs/deployment-prep/host/deployment-tin.yaml 
b/hieradata/labs/deployment-prep/host/deployment-tin.yaml
index 5ca7b7d..a138e89 100644
--- a/hieradata/labs/deployment-prep/host/deployment-tin.yaml
+++ b/hieradata/labs/deployment-prep/host/deployment-tin.yaml
@@ -1,2 +1,6 @@
 ---
 mount_nfs: false
+"hhvm::extra::cli":
+    hhvm:
+        server:
+            light_process_count: 0
diff --git a/modules/beta/manifests/config.pp b/modules/beta/manifests/config.pp
index 0975911..cb66321 100644
--- a/modules/beta/manifests/config.pp
+++ b/modules/beta/manifests/config.pp
@@ -3,8 +3,7 @@
 # Shared configuration for beta classes
 #
 class beta::config {
-    # IP address of deployment-tin host
-    $bastion_ip = '10.68.17.240'
+    $bastion_ip = '10.68.20.135'  # IP address of deployment-mira
 
     # Networks to allow for rsync
     $rsync_networks = [
diff --git a/modules/beta/manifests/deployaccess.pp 
b/modules/beta/manifests/deployaccess.pp
index 6e56469..754412b 100644
--- a/modules/beta/manifests/deployaccess.pp
+++ b/modules/beta/manifests/deployaccess.pp
@@ -1,7 +1,7 @@
 # TODO: remove this if https://phabricator.wikimedia.org/T121721
 # is fixed.
 class beta::deployaccess(
-    $bastion_ip = '10.68.17.240', # ip of deployment-tin
+    $bastion_ip = '10.68.20.135', # ip of deployment-mira
 ) {
 
     security::access::config { 'beta-allow-mwdeploy':
diff --git a/modules/role/manifests/beta/trebuchet_testing.pp 
b/modules/role/manifests/beta/trebuchet_testing.pp
index afedc51..e489a9c 100644
--- a/modules/role/manifests/beta/trebuchet_testing.pp
+++ b/modules/role/manifests/beta/trebuchet_testing.pp
@@ -9,7 +9,7 @@
     }
 
 
-    # Allow ssh inbound from deployment-tin.eqiad.wmflabs for testing
+    # Allow ssh inbound from beta bastion_ip for testing
     ferm::rule { 'deployment-bastion-trebuchet-testing-ssh':
         ensure => present,
         rule   => "proto tcp dport ssh saddr ${::beta::config::bastion_ip} 
ACCEPT;",
diff --git a/modules/scap/manifests/init.pp b/modules/scap/manifests/init.pp
index 59a7692..646273e 100644
--- a/modules/scap/manifests/init.pp
+++ b/modules/scap/manifests/init.pp
@@ -8,10 +8,10 @@
 #
 #  [*wmflabs_master*]
 #    Master scap rsync host in the wmflabs domain.
-#    Default 'deployment-tin.eqiad.wmflabs'.
+#    Default 'deployment-mira.eqiad.wmflabs'.
 class scap (
     $deployment_server = 'deployment',
-    $wmflabs_master = 'deployment-tin.eqiad.wmflabs',
+    $wmflabs_master = 'deployment-mira.eqiad.wmflabs',
 ) {
     package { 'scap':
         ensure => '3.2.5-1',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3a1238916db0048f537ef57e2ded28941537abed
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to