[MediaWiki-commits] [Gerrit] Revert "deployment::server: move IPv6 int to role" - change (operations/puppet)

2015-11-13 Thread Dzahn (Code Review) 
Dzahn has submitted this change and it was merged.

Change subject: Revert "deployment::server: move IPv6 int to role"
..


Revert "deployment::server: move IPv6 int to role"

This reverts commit f39aea8daab5d39655c712245c845dcffc965d29.
Breaks deployment-bastion puppet in beta cluster.

Bug: T118422
Change-Id: Ieb481b7d383ba7779cd07ce7aee3598f900177f4
---
M manifests/site.pp
M modules/role/manifests/deployment/server.pp
2 files changed, 4 insertions(+), 4 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index 28cce89..2f9a42e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2437,6 +2437,10 @@
 # deployment servers
 node 'tin.eqiad.wmnet', 'mira.codfw.wmnet' {
 role deployment::server, labsdb::manager
+
+interface::add_ip6_mapped { 'main':
+interface => 'eth0',
+}
 }
 
 # titanium hosts archiva.wikimedia.org
diff --git a/modules/role/manifests/deployment/server.pp 
b/modules/role/manifests/deployment/server.pp
index 8de3210..2b4b4af 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -4,10 +4,6 @@
 ) {
 include standard
 
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-
 # Can't include this while scap is present on the deployment server:
 # include misc::deployment::scripts
 include role::deployment::mediawiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb481b7d383ba7779cd07ce7aee3598f900177f4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert "deployment::server: move IPv6 int to role" - change (operations/puppet)

2015-11-12 Thread Thcipriani (Code Review) 
Thcipriani has uploaded a new change for review.

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

Change subject: Revert "deployment::server: move IPv6 int to role"
..

Revert "deployment::server: move IPv6 int to role"

This reverts commit f39aea8daab5d39655c712245c845dcffc965d29.
Breaks deployment-bastion puppet in beta cluster.

Bug: T118422
Change-Id: Ieb481b7d383ba7779cd07ce7aee3598f900177f4
---
M manifests/site.pp
M modules/role/manifests/deployment/server.pp
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/252732/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 899aa12..b0db50f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2436,6 +2436,10 @@
 # deployment servers
 node 'tin.eqiad.wmnet', 'mira.codfw.wmnet' {
 role deployment::server, labsdb::manager
+
+interface::add_ip6_mapped { 'main':
+interface => 'eth0',
+}
 }
 
 # titanium hosts archiva.wikimedia.org
diff --git a/modules/role/manifests/deployment/server.pp 
b/modules/role/manifests/deployment/server.pp
index 8de3210..2b4b4af 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -4,10 +4,6 @@
 ) {
 include standard
 
-interface::add_ip6_mapped { 'main':
-interface => 'eth0',
-}
-
 # Can't include this while scap is present on the deployment server:
 # include misc::deployment::scripts
 include role::deployment::mediawiki

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

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

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