opendev/system-config
Code Issues Proposed changes

Merge "Cleanup iweb/inap provider content"

Browse Source
This commit is contained in:
Zuul 2022-12-16 18:54:03 +00:00 committed by Gerrit Code Review
commit 19416523ff
7 changed files with 2 additions and 68 deletions
hiera
common.yaml
inventory
base
hosts.yaml
service
group_vars
bastion.yaml
host_vars
mirror02.mtl01.inap.opendev.org.yaml
playbooks
roles/letsencrypt-create-certs/handlers
main.yaml
templates/clouds
bridge_all_clouds.yaml.j2nodepool_clouds.yaml.j2

1
hiera/common.yaml

@ -51,7 +51,6 @@ cacti_hosts:
- mirror01.regionone.limestone.opendev.org
- mirror.bhs1.ovh.opendev.org
- mirror.gra1.ovh.opendev.org
- mirror.mtl01.inap.opendev.org
- mirror02.us-west-1.packethost.openstack.org
- mirror02.regionone.linaro-us.opendev.org
- mirror01.regionone.osuosl.opendev.org

11
inventory/base/hosts.yaml

@ -427,17 +427,6 @@ all:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC2TRVy/nt6krFmmGQ5CFr0GYXvS8J/8yr0zAL0LQbT15SaPr96dF6Hx1gR0aYISLNgKAYA5hwLWSy7LmjcMm/bv/TLJQHvk9piVmhKsbJhf9tAcGajOnoG8MqSn4vaptkQxQyvqQcDnGNKMjr+tv5k5rsXAVciC1Ulhw2IWwSKDGYzKO7yVaSI+/7hIVlTm4WREL4pXkf2ybDQuvj+OYv4nrdRePJg6l7yIMWxitzWl0E8LlP+BpoymE7WxAcbS46jdxOK9segfmtMRX3wVwVfgC0XZ+9SDIyfcXkwe2aFFtoAQHJ4G6w9KxcFvHglffv3DRySRg+4WfYJNrnL37XzySL9aFmsbcEM9POd1McCCb+OBvOLHv8sy+g8zzWovsvi4DcNxjCmNzMv+Shjc/rtlRDKAdjd4xOdlUG8gPdo3+wV+P0n+m0JcKxmN6ocx+SZW1oTcmgTzG+M+N+eW3qzoVjv0okY5RqRNSQQ1FDnCvc7lextAxt35DiZBEbCkzk='
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFeqlIzcgQGwKfVHGHvjI1uGCmi24DwZqlYpYVc1uLf/E0eUWebFqEWoyEWY7UXyx3X0ky7uFTCSNh7lE6VI9L8='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEEWMuq7/KGoYR97DZZxOkY9oHH0rCmxNaUzt3/3QSC+'
mirror02.mtl01.inap.opendev.org:
ansible_host: 198.72.125.6
location:
cloud: openstackci-inap
region_name: mtl01
public_v4: 198.72.125.6
public_v6: ''
host_keys:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7vAH26cNErBZ1YysfhdrWBV4/AmHxXxoT69w14RboST585HVQHBdvBGs8jPNBPtr4OdHFP81ipIDEc/zk+NXwRNJAV0FxjRcVRreLZq1NNcusk7L0jJDhHWXX1p1TKiE4JQV5rIcAC4+rCz8+K9qHLwf5SjK3OF8E7eok2O+1aL+42dQXajDu+/bdYp6IGQaK8VW0YtB+jpR0J7XVQGm4N0XL2Up0Ig7iwCJu/9goZF/ta2E//wCzaKmALO0JoForjsHbvtJctR6UpDXVYr4SxzYgkoYZ29ePTwFWEvSYgTA6klFjoAgihk2ZP6hOZ/EGp5YL49JE8jlADvu5ley5'
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBB3shzGJqC+uNp/2avQpNsnEbO7rXddD+uQ3uVzS9FI8zpihMhRTI9kNsKcu0PoRK+KgYoEQx22QRSm7f+CVq88='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGY16NRUoQvKYGImfOYg+93BfNlWtnQrU8vFlKDAJ8hP'
mirror01.ord.rax.opendev.org:
ansible_host: 23.253.216.84
location:

14
inventory/service/group_vars/bastion.yaml

@ -199,20 +199,6 @@ cloud_launcher_clouds:
- openstackci-keypairs
- openstackci-security
# iweb
- name: openstackci-iweb-mtl01
oscc_cloud: openstackci-iweb
region_name: mtl01
profiles:
- openstackci-keypairs
- openstackci-security
- name: openstackjenkins-iweb-mtl01
oscc_cloud: openstackjenkins-iweb
region_name: mtl01
profiles:
- openstackci-keypairs
- openstackci-security
# vexxhost
- name: openstackci-vexxhost-mtl1
oscc_cloud: openstackci-vexxhost

6
inventory/service/host_vars/mirror02.mtl01.inap.opendev.org.yaml

@ -1,6 +0,0 @@
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

3
playbooks/roles/letsencrypt-create-certs/handlers/main.yaml

@ -201,9 +201,6 @@
- name: letsencrypt updated mirror02-regionone-linaro-us-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror02-mtl01-inap-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror01-sjc1-vexxhost-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml

2
playbooks/templates/clouds/bridge_all_clouds.yaml.j2

@ -21,6 +21,8 @@
#
clouds:
# TODO remove inap and iweb entries once we're happy we will no longer
# talk to these clouds to clean up their shutdown.
openstackci-inap:
profile: internap
auth:

33
playbooks/templates/clouds/nodepool_clouds.yaml.j2

@ -66,39 +66,6 @@ clouds:
username: '{{ nodepool_ovh_username }}'
password: '{{ nodepool_ovh_password }}'
project_name: '{{ nodepool_ovh_project }}'
inap:
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'
iweb:
api_timeout: 60
auth:
auth_url: https://identity.api.cloud.iweb.com
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'
floating_ip_source: None
vexxhost:
profile: vexxhost
regions: