diff --git a/inventory/service/host_vars/bridge.openstack.org.yaml b/inventory/service/host_vars/bridge.openstack.org.yaml index c9b12552f2..9d04b0a514 100644 --- a/inventory/service/host_vars/bridge.openstack.org.yaml +++ b/inventory/service/host_vars/bridge.openstack.org.yaml @@ -199,15 +199,15 @@ cloud_launcher_clouds: - openstackci-keypairs - openstackci-security - # inap - - name: openstackci-inap-mtl01 - oscc_cloud: openstackci-inap + # iweb + - name: openstackci-iweb-mtl01 + oscc_cloud: openstackci-iweb region_name: mtl01 profiles: - openstackci-keypairs - openstackci-security - - name: openstackjenkins-inap-mtl01 - oscc_cloud: openstackjenkins-inap + - name: openstackjenkins-iweb-mtl01 + oscc_cloud: openstackjenkins-iweb region_name: mtl01 profiles: - openstackci-keypairs diff --git a/inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml b/inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml index 343b0a53b2..8770d12835 100644 --- a/inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml +++ b/inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml @@ -1,4 +1,6 @@ letsencrypt_certs: mirror02-mtl01-inap-main: - mirror02.mtl01.inap.opendev.org + - mirror02.mtl01.iweb.opendev.org - mirror.mtl01.inap.opendev.org + - mirror.mtl01.iweb.opendev.org diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index d4ea9862ae..c6c7d982a2 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -45,6 +45,30 @@ clouds: networks: - name: inap-17304-WAN1101 routes_externally: True + openstackci-iweb: + profile: internap + auth: + username: '{{ clouds.openstackci_internap_username }}' + password: '{{ clouds.openstackci_internap_password }}' + project_name: '{{ clouds.openstackci_internap_project_name }}' + regions: + - name: mtl01 + values: + networks: + - name: inap-17301-WAN1102 + routes_externally: True + openstackjenkins-iweb: + profile: internap + auth: + username: '{{ clouds.openstackjenkins_internap_username }}' + password: '{{ clouds.openstackjenkins_internap_password }}' + project_name: '{{ clouds.openstackjenkins_internap_project_name }}' + regions: + - name: mtl01 + values: + networks: + - name: inap-17304-WAN1101 + routes_externally: True openstackci-ovh: regions: - GRA1 diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 570808e7fa..f4ce33048b 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -83,6 +83,22 @@ clouds: metrics: statsd: prefix: 'nodepool.task.inap-mtl01' + iweb: + profile: internap + api_timeout: 60 + auth: + username: '{{ nodepool_internap_username }}' + password: '{{ nodepool_internap_password }}' + project_name: '{{ nodepool_internap_project }}' + regions: + - name: mtl01 + values: + networks: + - name: inap-17304-WAN1101 + routes_externally: True + metrics: + statsd: + prefix: 'nodepool.task.inap-mtl01' vexxhost: profile: vexxhost regions: