Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/227744
Change subject: beta: swap text caches to text04, which is jessie
......................................................................
beta: swap text caches to text04, which is jessie
Bug: T98758
Change-Id: I29615c497281c116c13adc99b0ecf00a44a6d3a5
---
M manifests/role/labsdns.pp
M modules/dnsrecursor/templates/ip-alias.lua.erb
M modules/openstack/manifests/nova/network.pp
3 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/227744/1
diff --git a/manifests/role/labsdns.pp b/manifests/role/labsdns.pp
index 37d4112..3d6257f 100644
--- a/manifests/role/labsdns.pp
+++ b/manifests/role/labsdns.pp
@@ -71,8 +71,8 @@
# FIXME: these should be automatically synced rather than hard-coded.
$nova_floating_ip_aliases = {
# eqiad
- 'deployment-cache-text02' => {public_ip => '208.80.155.135',
- private_ip => '10.68.16.16' },
+ 'deployment-cache-text04' => {public_ip => '208.80.155.135',
+ private_ip => '10.68.18.103' },
'deployment-cache-upload02' => {public_ip => '208.80.155.136',
private_ip => '10.68.17.51' },
'deployment-cache-bits01' => {public_ip => '208.80.155.137',
diff --git a/modules/dnsrecursor/templates/ip-alias.lua.erb
b/modules/dnsrecursor/templates/ip-alias.lua.erb
index 3c0ce9f..eba89eb 100644
--- a/modules/dnsrecursor/templates/ip-alias.lua.erb
+++ b/modules/dnsrecursor/templates/ip-alias.lua.erb
@@ -8,15 +8,15 @@
--
-- From puppet we're getting a fancy data structure like this:
-- {
--- 'deployment-cache-text02' => {public_ip => '208.80.155.135',
--- private_ip => '10.68.16.16' },
+-- 'deployment-cache-text04' => {public_ip => '208.80.155.135',
+-- private_ip => '10.68.18.103' },
-- 'deployment-cache-upload02' => {public_ip => '208.80.155.136',
-- private_ip => '10.68.17.51' },
-- }
-- The following .erb magic pulls that apart and reconstructs it into a
-- lua table with entries like:
--- aliastable['deployment-cache-text02']['public_ip'] = '208.80.155.135'
--- aliastable['deployment-cache-text02']['private_ip'] = '10.68.16.16'
+-- aliastable['deployment-cache-text04']['public_ip'] = '208.80.155.135'
+-- aliastable['deployment-cache-text04']['private_ip'] = '10.68.18.103'
-- aliastable['deployment-cache-upload02']['public_ip'] =
'208.80.155.136'
-- aliastable['deployment-cache-upload02']['private_ip'] = '10.68.17.51'
--
@@ -33,7 +33,7 @@
<% end -%>
-- Flatten our table into a simple mapping with entries like this:
--- aliasmapping['208.80.155.135'] = '10.68.16.16'
+-- aliasmapping['208.80.155.135'] = '10.68.18.103'
-- aliasmapping['208.80.155.136'] = '10.68.17.51'
aliasmapping = {}
for name,entries in pairs(aliastable) do
diff --git a/modules/openstack/manifests/nova/network.pp
b/modules/openstack/manifests/nova/network.pp
index 383b0e5..34470cc 100644
--- a/modules/openstack/manifests/nova/network.pp
+++ b/modules/openstack/manifests/nova/network.pp
@@ -21,8 +21,8 @@
$nova_dnsmasq_aliases = {
# eqiad
- 'deployment-cache-text02' => {public_ip => '208.80.155.135',
- private_ip => '10.68.16.16' },
+ 'deployment-cache-text04' => {public_ip => '208.80.155.135',
+ private_ip => '10.68.18.103' },
'deployment-cache-upload02' => {public_ip => '208.80.155.136',
private_ip => '10.68.17.51' },
'deployment-cache-bits01' => {public_ip => '208.80.155.137',
--
To view, visit https://gerrit.wikimedia.org/r/227744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29615c497281c116c13adc99b0ecf00a44a6d3a5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
