Faidon Liambotis has uploaded a new change for review. https://gerrit.wikimedia.org/r/260923
Change subject: network: move frack networks into a separate realm ...................................................................... network: move frack networks into a separate realm frack is a realm for all intents and purposes -- move its subnets away from the production realm hierarchy. Change-Id: Idf2cdd9d9101af59a06b0d5085c695e75e2c67e5 --- M manifests/network.pp 1 file changed, 26 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/23/260923/1 diff --git a/manifests/network.pp b/manifests/network.pp index ce1cd44..ed4f96e 100644 --- a/manifests/network.pp +++ b/manifests/network.pp @@ -89,9 +89,6 @@ 'ipv4' => '208.80.154.224/27', 'ipv6' => '2620:0:861:ed1a::/64', }, - 'public-frack-eqiad' => { - 'ipv4' => '208.80.155.0/27', - }, }, 'private' => { 'private1-a-eqiad' => { @@ -157,9 +154,6 @@ 'ipv4' => '10.64.53.0/24', 'ipv6' => '2620:0:861:108::/64' }, - 'private-frack-eqiad' => { - 'ipv4' => '10.64.40.0/24', - }, }, }, 'codfw' => { @@ -184,9 +178,6 @@ 'ipv4' => '208.80.153.224/27', 'ipv6' => '2620:0:860:ed1a::/64', }, - 'public-frack-codfw' => { - 'ipv4' => '208.80.152.224/28', - }, }, 'private' => { 'private1-a-codfw' => { @@ -204,9 +195,6 @@ 'private1-d-codfw' => { 'ipv4' => '10.192.48.0/22', 'ipv6' => '2620:0:860:104::/64' - }, - 'private-frack-codfw' => { - 'ipv4' => '10.195.0.0/25', }, }, }, @@ -247,6 +235,32 @@ }, }, }, + 'frack' => { + 'eqiad' => { + 'public' => { + 'public-frack-eqiad' => { + 'ipv4' => '208.80.155.0/27', + }, + }, + 'private' => { + 'private-frack-eqiad' => { + 'ipv4' => '10.64.40.0/24', + }, + }, + }, + 'codfw' => { + 'public' => { + 'public-frack-codfw' => { + 'ipv4' => '208.80.152.224/28', + }, + }, + 'private' => { + 'private-frack-codfw' => { + 'ipv4' => '10.195.0.0/25', + }, + }, + }, + }, } -- To view, visit https://gerrit.wikimedia.org/r/260923 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idf2cdd9d9101af59a06b0d5085c695e75e2c67e5 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