subject:"\[MediaWiki\-commits\] \[Gerrit\] operations\/puppet\[production\]\: eqiad recdns IP fix\: switch in puppet"

[MediaWiki-commits] [Gerrit] operations/puppet[production]: eqiad recdns IP fix: switch in puppet

2016-10-20 Thread BBlack (Code Review)

BBlack has submitted this change and it was merged.

Change subject: eqiad recdns IP fix: switch in puppet
..


eqiad recdns IP fix: switch in puppet

Note: we'll also probably need salt fixes, and fixes for
puppet-unmanaged config in network devices, etc...

Bug: T143915
Change-Id: If9056216f10fe1629123c5953b5113acb0ae0576
---
M manifests/realm.pp
M manifests/site.pp
M modules/install_server/files/autoinstall/subnets/analytics1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/analytics1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-support1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-a-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-c-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-d-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-esams.cfg
M modules/install_server/files/autoinstall/subnets/private1-ulsfo.cfg
M modules/install_server/files/autoinstall/subnets/public1-a-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-c-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-d-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-esams.cfg
M modules/install_server/files/autoinstall/subnets/public1-ulsfo.cfg
M modules/install_server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
M modules/install_server/files/dhcpd/dhcpd.conf
35 files changed, 43 insertions(+), 43 deletions(-)

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



diff --git a/manifests/realm.pp b/manifests/realm.pp
index 3db4f4b..77b6f22 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -99,11 +99,11 @@
 $nameservers = [ ipresolve($dnsconfig['recursor'],4), 
ipresolve($dnsconfig['recursor_secondary'],4) ]
 } else {
 $nameservers = $site ? {
-'eqiad' => [ '208.80.154.239', '208.80.153.254' ], # eqiad -> eqiad, 
codfw
-'codfw' => [ '208.80.153.254', '208.80.154.239' ], # codfw -> codfw, 
eqiad
-'ulsfo' => [ '208.80.154.239', '208.80.153.254' ], # ulsfo -> eqiad, 
codfw
-'esams' => [ '91.198.174.216', '208.80.154.239' ], # esams -> esams, 
eqiad
-default => [ '208.80.154.239', '208.80.153.254' ], #   -> eqiad, 
codfw
+'eqiad' => [ '208.80.154.254', '208.80.153.254' ], # eqiad -> eqiad, 
codfw
+'codfw' => [ '208.80.153.254', '208.80.154.254' ], # codfw -> codfw, 
eqiad
+'ulsfo' => [ '208.80.154.254', '208.80.153.254' ], # ulsfo -> eqiad, 
codfw
+'esams' => [ '91.198.174.216', '208.80.154.254' ], # esams -> esams, 
eqiad
+default => [ '208.80.154.254', '208.80.153.254' ], #   -> eqiad, 
codfw
 }
 }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 52e931f..cc6d2f5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1744,7 +1744,7 @@
 #   so they need to use the recursive DNS backends directly
 #   (acamar and achernar) with fallback to eqiad
 # (doing this for all lvs for now, see T103921)
-$nameservers_override = [ '208.80.153.12', '208.80.153.42', 
'208.80.154.239' ]
+$nameservers_override = [ '208.80.153.12', '208.80.153.42', 
'208.80.154.254' ]
 role(lvs::balancer)
 
 interface::add_ip6_mapped { 'main': interface => 'eth0' }
@@ -1844,7 +1844,7 @@
 #   so they need to use the recursive DNS backends directly
 #   (nescio and maerlant) with fallback to eqiad
 # (doing this for all lvs for now, see T103921)
-$nameservers_override = [ '91.198.174.106', '91.198.174.122', 
'208.80.154.239' ]
+$nameservers_override = [

[MediaWiki-commits] [Gerrit] operations/puppet[production]: eqiad recdns IP fix: switch in puppet

2016-10-14 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: eqiad recdns IP fix: switch in puppet
..

eqiad recdns IP fix: switch in puppet

Note: we'll also probably need salt fixes, and fixes for
puppet-unmanaged config in network devices, etc...

Bug: T143915
Change-Id: If9056216f10fe1629123c5953b5113acb0ae0576
---
M manifests/realm.pp
M manifests/site.pp
M modules/install_server/files/autoinstall/subnets/analytics1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/analytics1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/analytics1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/analytics1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-hosts1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/labs-support1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/labs-support1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-a-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-c-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-d-codfw.cfg
M modules/install_server/files/autoinstall/subnets/private1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/private1-esams.cfg
M modules/install_server/files/autoinstall/subnets/private1-ulsfo.cfg
M modules/install_server/files/autoinstall/subnets/public1-a-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-a-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-b-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-b-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-c-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-c-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-d-codfw.cfg
M modules/install_server/files/autoinstall/subnets/public1-d-eqiad.cfg
M modules/install_server/files/autoinstall/subnets/public1-esams.cfg
M modules/install_server/files/autoinstall/subnets/public1-ulsfo.cfg
M modules/install_server/files/autoinstall/subnets/sandbox1-b-eqiad.cfg
M modules/install_server/files/dhcpd/dhcpd.conf
35 files changed, 43 insertions(+), 43 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/315930/1

diff --git a/manifests/realm.pp b/manifests/realm.pp
index 3db4f4b..77b6f22 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -99,11 +99,11 @@
 $nameservers = [ ipresolve($dnsconfig['recursor'],4), 
ipresolve($dnsconfig['recursor_secondary'],4) ]
 } else {
 $nameservers = $site ? {
-'eqiad' => [ '208.80.154.239', '208.80.153.254' ], # eqiad -> eqiad, 
codfw
-'codfw' => [ '208.80.153.254', '208.80.154.239' ], # codfw -> codfw, 
eqiad
-'ulsfo' => [ '208.80.154.239', '208.80.153.254' ], # ulsfo -> eqiad, 
codfw
-'esams' => [ '91.198.174.216', '208.80.154.239' ], # esams -> esams, 
eqiad
-default => [ '208.80.154.239', '208.80.153.254' ], #   -> eqiad, 
codfw
+'eqiad' => [ '208.80.154.254', '208.80.153.254' ], # eqiad -> eqiad, 
codfw
+'codfw' => [ '208.80.153.254', '208.80.154.254' ], # codfw -> codfw, 
eqiad
+'ulsfo' => [ '208.80.154.254', '208.80.153.254' ], # ulsfo -> eqiad, 
codfw
+'esams' => [ '91.198.174.216', '208.80.154.254' ], # esams -> esams, 
eqiad
+default => [ '208.80.154.254', '208.80.153.254' ], #   -> eqiad, 
codfw
 }
 }
 
diff --git a/manifests/site.pp b/manifests/site.pp
index 1765b3c..91232ca 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1764,7 +1764,7 @@
 #   so they need to use the recursive DNS backends directly
 #   (acamar and achernar) with fallback to eqiad
 # (doing this for all lvs for now, see T103921)
-$nameservers_override = [ '208.80.153.12', '208.80.153.42', 
'208.80.154.239' ]
+$nameservers_override = [ '208.80.153.12', '208.80.153.42', 
'208.80.154.254' ]
 role(lvs::balancer)
 
 interface::add_ip6_mapped { 'main': interface => 'eth0' }
@@ -1864,7 +1864,7 @@
 #   so they need to use the recursive DNS backends directly
 #   (nescio and maerlant) with fallback to eqiad
 # (doing this for all lvs for now, see T103921)
-$nameservers_override = [ '91.198.174.106', '91.198.174.122',

[MediaWiki-commits] [Gerrit] operations/puppet[production]: eqiad recdns IP fix: switch in puppet

[MediaWiki-commits] [Gerrit] operations/puppet[production]: eqiad recdns IP fix: switch in puppet

2 matches

Site Navigation

Mail list logo

Footer information