From 1bc4dabc4505761f9cd29de9114cda649162420c Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Wed, 9 Aug 2017 17:16:41 -0400 Subject: [PATCH] Remove internap-nyj01 We don't actually use this region any more, remove it so we don't attempt to access it with dynamic inventory with ansible. Change-Id: Ic6d4474a61ee32d198f4d70800fd79b8bd80623f Signed-off-by: Paul Belanger --- doc/source/bandersnatch.rst | 1 - hiera/common.yaml | 1 - .../templates/nodepool/clouds.yaml.erb | 7 ------- .../templates/puppetmaster/all-clouds.yaml.erb | 14 -------------- .../templates/puppetmaster/ansible-clouds.yaml.erb | 7 ------- 5 files changed, 30 deletions(-) diff --git a/doc/source/bandersnatch.rst b/doc/source/bandersnatch.rst index faab497b4f..13c9804321 100644 --- a/doc/source/bandersnatch.rst +++ b/doc/source/bandersnatch.rst @@ -16,7 +16,6 @@ At a Glance * http://mirror.dfw.rax.openstack.org/pypi * http://mirror.gra1.ovh.openstack.org/pypi * http://mirror.iad.rax.openstack.org/pypi - * http://mirror.nyj01.internap.openstack.org/pypi * http://mirror.ord.rax.openstack.org/pypi :Puppet: * :file:`modules/openstack_project/manifests/static.pp` diff --git a/hiera/common.yaml b/hiera/common.yaml index 665d1f8517..31b619d170 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -448,7 +448,6 @@ cacti_hosts: - mirror.la1.citycloud.openstack.org - mirror.lon1.citycloud.openstack.org - mirror.mtl01.internap.openstack.org -- mirror.nyj01.internap.openstack.org - mirror.ord.rax.openstack.org - mirror.regionone.infracloud-chocolate.openstack.org - mirror.regionone.infracloud-vanilla.openstack.org diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index b1e3be284c..2dfe338405 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -73,13 +73,6 @@ clouds: networks: - name: inap-17304-WAN1101 routes_externally: True - - name: nyj01 - values: - networks: - - name: inap-17304-WAN2342 - routes_externally: True - - name: inap-17304-LAN3326 - routes_externally: False vexxhost: region_name: ca-ymq-1 profile: vexxhost diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index fd87135664..4199ec8e1a 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -90,13 +90,6 @@ clouds: networks: - name: inap-17301-WAN1102 routes_externally: True - - name: nyj01 - values: - networks: - - name: inap-17301-WAN2344 - routes_externally: True - - name: inap-17301-LAN3328 - routes_externally: False openstackjenkins-internap: profile: internap auth: @@ -128,13 +121,6 @@ clouds: networks: - name: inap-17304-WAN1101 routes_externally: True - - name: nyj01 - values: - networks: - - name: inap-17304-WAN2342 - routes_externally: True - - name: inap-17304-LAN3326 - routes_externally: False openstackci-ovh: regions: - GRA1 diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index a7f3d0b82c..55c5092c48 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -41,13 +41,6 @@ clouds: networks: - name: inap-17301-WAN1102 routes_externally: True - - name: nyj01 - values: - networks: - - name: inap-17301-WAN2344 - routes_externally: True - - name: inap-17301-LAN3328 - routes_externally: False openstackci-ovh: regions: - GRA1