Remove internap clouds

This removes remaining references to internap (renamed to inap).

It also updates some items (cacti/nodepool logging) that were missed
in the rename.

Change-Id: Ibafd416e9e55aa458a50eb71922065a35e3d99f4
This commit is contained in:
James E. Blair 2017-08-17 09:17:16 -07:00 committed by Paul Belanger
parent 0820e29003
commit 1b5d1ddb11
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
6 changed files with 8 additions and 97 deletions

View File

@ -454,7 +454,7 @@ cacti_hosts:
- mirror01.ca-ymq-1.vexxhost.openstack.org - mirror01.ca-ymq-1.vexxhost.openstack.org
- mirror.bhs1.ovh.openstack.org - mirror.bhs1.ovh.openstack.org
- mirror.gra1.ovh.openstack.org - mirror.gra1.ovh.openstack.org
- mirror.mtl01.internap.openstack.org - mirror.mtl01.inap.openstack.org
- mirror.regionone.tripleo-test-cloud-rh1.openstack.org - mirror.regionone.tripleo-test-cloud-rh1.openstack.org
- mirror.regionone.tripleo-test-cloud-rh2.openstack.org - mirror.regionone.tripleo-test-cloud-rh2.openstack.org
- mirror-update.openstack.org - mirror-update.openstack.org

View File

@ -42,25 +42,6 @@ clouds:
project_name: '<%= @tripleo_project %>' project_name: '<%= @tripleo_project %>'
auth_url: 'https://ci-overcloud.rh2.tripleo.org:13000/v2.0' auth_url: 'https://ci-overcloud.rh2.tripleo.org:13000/v2.0'
floating_ip_source: neutron floating_ip_source: neutron
internap:
profile: internap
auth:
username: '<%= @internap_username %>'
password: '<%= @internap_password %>'
project_name: '<%= @internap_project %>'
regions:
- name: mtl01
values:
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
inap: inap:
profile: internap profile: internap
auth: auth:

View File

@ -10,7 +10,7 @@ keys=root,nodepool,requests,shade,image,kazoo,
dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7, dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7,
dib_fedora-25, dib_fedora-26, dib_opensuse-422, dib_opensuse-423, dib_fedora-25, dib_fedora-26, dib_opensuse-422, dib_opensuse-423,
rax-dfw_upload, rax-ord_upload, rax-iad_upload, ovh-gra1_upload, rax-dfw_upload, rax-ord_upload, rax-iad_upload, ovh-gra1_upload,
ovh-bhs1_upload, internap-mtl01_upload, ovh-bhs1_upload, inap-mtl01_upload,
tripleo-test-cloud-rh1_upload, infracloud-vanilla_upload, tripleo-test-cloud-rh1_upload, infracloud-vanilla_upload,
infracloud-chocolate_upload, citycloud-lon1_upload, infracloud-chocolate_upload, citycloud-lon1_upload,
citycloud-kna1_upload, citycloud-la1_upload, citycloud-sto2_upload citycloud-kna1_upload, citycloud-la1_upload, citycloud-sto2_upload
@ -20,7 +20,7 @@ keys=console,debug,normal,image,
dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7, dib_debian-jessie, dib_ubuntu-trusty, dib_ubuntu-xenial, dib_centos-7,
dib_fedora-25, dib_fedora-26, dib_opensuse-422, dib_opensuse-423, dib_fedora-25, dib_fedora-26, dib_opensuse-422, dib_opensuse-423,
rax-dfw_upload, rax-ord_upload, rax-iad_upload, ovh-gra1_upload, rax-dfw_upload, rax-ord_upload, rax-iad_upload, ovh-gra1_upload,
ovh-bhs1_upload, internap-mtl01_upload, ovh-bhs1_upload, inap-mtl01_upload,
tripleo-test-cloud-rh1_upload, infracloud-vanilla_upload, tripleo-test-cloud-rh1_upload, infracloud-vanilla_upload,
infracloud-chocolate_upload, citycloud-lon1_upload, infracloud-chocolate_upload, citycloud-lon1_upload,
citycloud-kna1_upload, citycloud-la1_upload, citycloud-sto2_upload citycloud-kna1_upload, citycloud-la1_upload, citycloud-sto2_upload
@ -246,17 +246,17 @@ class=logging.handlers.TimedRotatingFileHandler
formatter=simple formatter=simple
args=('<%= @upload_log_document_root %>/ovh-bhs1.log', 'H', 8, 30,) args=('<%= @upload_log_document_root %>/ovh-bhs1.log', 'H', 8, 30,)
[logger_internap-mtl01_upload] [logger_inap-mtl01_upload]
level=DEBUG level=DEBUG
handlers=internap-mtl01_upload handlers=inap-mtl01_upload
qualname=nodepool.image.upload.internap-mtl01 qualname=nodepool.image.upload.inap-mtl01
propagate=0 propagate=0
[handler_internap-mtl01_upload] [handler_inap-mtl01_upload]
level=DEBUG level=DEBUG
class=logging.handlers.TimedRotatingFileHandler class=logging.handlers.TimedRotatingFileHandler
formatter=simple formatter=simple
args=('<%= @upload_log_document_root %>/internap-mtl01.log', 'H', 8, 30,) args=('<%= @upload_log_document_root %>/inap-mtl01.log', 'H', 8, 30,)
[logger_tripleo-test-cloud-rh1_upload] [logger_tripleo-test-cloud-rh1_upload]
level=DEBUG level=DEBUG

View File

@ -59,25 +59,6 @@ clouds:
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: None floating_ip_source: None
cacert: /etc/openstack/infracloud_chocolate_cacert.pem cacert: /etc/openstack/infracloud_chocolate_cacert.pem
openstackci-internap:
profile: internap
auth:
username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
regions:
- name: mtl01
values:
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-inap: openstackci-inap:
profile: internap profile: internap
auth: auth:
@ -90,25 +71,6 @@ clouds:
networks: networks:
- name: inap-17301-WAN1102 - name: inap-17301-WAN1102
routes_externally: True routes_externally: True
openstackjenkins-internap:
profile: internap
auth:
username: <%= @puppetmaster_clouds['openstackjenkins_internap_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_internap_password'] %>
project_name: <%= @puppetmaster_clouds['openstackjenkins_internap_project_name'] %>
regions:
- name: mtl01
values:
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
openstackjenkins-inap: openstackjenkins-inap:
profile: internap profile: internap
auth: auth:

View File

@ -10,25 +10,6 @@ cache:
port: 5 port: 5
floating-ip: 5 floating-ip: 5
clouds: clouds:
openstackci-internap:
profile: internap
auth:
username: <%= @puppetmaster_clouds['openstackci_internap_username'] %>
password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
regions:
- name: mtl01
values:
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-inap: openstackci-inap:
profile: internap profile: internap
auth: auth:

View File

@ -139,19 +139,6 @@ clouds:
- openstackci-keypairs - openstackci-keypairs
- openstackci-security - openstackci-security
# internap
- name: openstackci-internap-mtl01
oscc_cloud: openstackci-internap
region_name: mtl01
profiles:
- openstackci-keypairs
- openstackci-security
- name: openstackjenkins-internap-mtl01
oscc_cloud: openstackjenkins-internap
region_name: mtl01
profiles:
- openstackci-keypairs
- openstackci-security
# inap # inap
- name: openstackci-inap-mtl01 - name: openstackci-inap-mtl01
oscc_cloud: openstackci-inap oscc_cloud: openstackci-inap