Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/260922
Change subject: network: move esams/ulsfo subnets below codfw
......................................................................
network: move esams/ulsfo subnets below codfw
Minor reordering commit, no functional change.
Change-Id: Ieb1cd56bd75ee4978ac6308443d3bd2c74479976
---
M manifests/network.pp
1 file changed, 36 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/260922/1
diff --git a/manifests/network.pp b/manifests/network.pp
index 065ebfe..ce1cd44 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -162,42 +162,6 @@
},
},
},
- 'esams' => {
- 'public' => {
- 'public1-esams' => {
- 'ipv4' => '91.198.174.0/25',
- 'ipv6' => '2620:0:862:1::/64'
- },
- 'public1-lvs-esams' => {
- 'ipv4' => '91.198.174.192/27',
- 'ipv6' => '2620:0:862:ed1a::/64',
- },
- },
- 'private' => {
- 'private1-esams' => {
- 'ipv4' => '10.20.0.0/24',
- 'ipv6' => '2620:0:862:102::/64'
- },
- },
- },
- 'ulsfo' => {
- 'public' => {
- 'public1-ulsfo' => {
- 'ipv4' => '198.35.26.0/28',
- 'ipv6' => '2620:0:863:1::/64'
- },
- 'public1-lvs-ulsfo' => {
- 'ipv4' => '198.35.26.96/27',
- 'ipv6' => '2620:0:863:ed1a::/64',
- },
- },
- 'private' => {
- 'private1-ulsfo' => {
- 'ipv4' => '10.128.0.0/24',
- 'ipv6' => '2620:0:863:101::/64'
- },
- },
- },
'codfw' => {
'public' => {
'public1-a-codfw' => {
@@ -246,6 +210,42 @@
},
},
},
+ 'esams' => {
+ 'public' => {
+ 'public1-esams' => {
+ 'ipv4' => '91.198.174.0/25',
+ 'ipv6' => '2620:0:862:1::/64'
+ },
+ 'public1-lvs-esams' => {
+ 'ipv4' => '91.198.174.192/27',
+ 'ipv6' => '2620:0:862:ed1a::/64',
+ },
+ },
+ 'private' => {
+ 'private1-esams' => {
+ 'ipv4' => '10.20.0.0/24',
+ 'ipv6' => '2620:0:862:102::/64'
+ },
+ },
+ },
+ 'ulsfo' => {
+ 'public' => {
+ 'public1-ulsfo' => {
+ 'ipv4' => '198.35.26.0/28',
+ 'ipv6' => '2620:0:863:1::/64'
+ },
+ 'public1-lvs-ulsfo' => {
+ 'ipv4' => '198.35.26.96/27',
+ 'ipv6' => '2620:0:863:ed1a::/64',
+ },
+ },
+ 'private' => {
+ 'private1-ulsfo' => {
+ 'ipv4' => '10.128.0.0/24',
+ 'ipv6' => '2620:0:863:101::/64'
+ },
+ },
+ },
},
}
--
To view, visit https://gerrit.wikimedia.org/r/260922
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb1cd56bd75ee4978ac6308443d3bd2c74479976
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <fai...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
