opendev/system-config
Code Issues Proposed changes

Remove linaro-us cloud

Browse Source 
All references to this cloud have been removed from nodepool, so we
can now remove nb03 and the mirror node.

Change-Id: I4d97f7bbb6392656017b1774b413b58bdb797323
This commit is contained in:
Ian Wienand 2023-01-25 11:37:05 +11:00
parent a22ef22fd2
commit 805ed731c0
No known key found for this signature in database
8 changed files with 2 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hiera/common.yaml
View File

@ -33,7 +33,6 @@ cacti_hosts:
- lists.openstack.org
- nb01.opendev.org
- nb02.opendev.org
- nb03.opendev.org
- nb04.opendev.org
- nl01.opendev.org
- nl02.opendev.org
@ -53,7 +52,6 @@ cacti_hosts:
- mirror.bhs1.ovh.opendev.org
- mirror.gra1.ovh.opendev.org
- mirror02.us-west-1.packethost.openstack.org
- mirror02.regionone.linaro-us.opendev.org
- mirror01.regionone.osuosl.opendev.org
- mirror02.iad3.inmotion.opendev.org
- mirror-update.opendev.org

22
inventory/base/hosts.yaml
View File

@ -416,17 +416,6 @@ all:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCVcT1kdEvQz9+baAg8kTJ3UyIdSuH7U1fu++QXWgm0yAMkwktljytgQA8AgjclFrdsgme7CSxmGQ8xFie5r4sfWiO+TP4WRi4ylAAoRPX8xR5nrrVU4JiOiI74/5WONTRlK5MonAzA1qbtZJtKaSJcGdxC1pryyeSjqUf3QdGliKD1xh5NzmlPeQ4z/UUJlR8xyYpqqXUOcVmEx5R32WIeNWxCzwNNhBy5+e2NoQHqGucRSlNq/OuoG7AiNKixz4mjsAgxJ4cDYoBraYhKT5z9BIV+pJ8kDF4zgQVqgTfTwomEafcl2za1QnJG0nx9+l2kosn2y4YIh0U7lWnnpfskePxkhoFdKk6g3TGHRHg5yGTGGf0i+NBVrFpFgvy+6SuoonxPdUN+NwNoIgXauKe67rxPY+XzLbFw95xH/j6Bg6aswTGnuUZh+HNk0HVtHp9Bittg+GgwXkR+80m7LvXxfpSDuYM0RdK6ckUZQmrklfXXTKqP2tygMwk9HG9MBcM='
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGmfQrjbtpQLaOzQWgfmkDAWMxUyr+gHwcKXzuHzGpjqzWUsBpAw2LQw1DIbnpIF2c2nAr7BEg8Fi6Q9Fe1FMUE='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINA8ajkyUlXiclmsCD9pEdAL2HW+ns2eIj5BWctByaiF'
mirror02.regionone.linaro-us.opendev.org:
ansible_host: 139.178.85.140
location:
cloud: openstackci-linaro-us
region_name: RegionOne
public_v4: 139.178.85.140
public_v6: 2604:1380:4111:3e54:f816:3eff:fe17:6b17
host_keys:
- '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+'
mirror01.regionone.linaro.opendev.org:
ansible_host: 147.28.149.111
location:
@ -534,17 +523,6 @@ all:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9Dk9EahNusWDMjPyDId6dI81yLn3tk1kt4CjewBpivjcbOwCSHcRcgrZZiyT11ACSwKfP0VbLUitmcKAeVnZq5XhoLZu1Ze9br/RtiIw6bk45LF2U0xFV/0e+0FgQjxurg2sqKB1ElNceCGzqNMz5E00YcuyGxMQBYIaE1oAn8sm1CP4M24z9jxNe3LVdGzHkl3EngaRuJ3kOqZZG3TWJZC+quYJ875ECq1kcRy9rjYrxFvm0Y2Q71MnBfXRmj6ZQ8SkbWINto4rn9AaFv65nIQYHHQTJ5adKVevzrHWivhZ12SFrT8IUj/OYOB+NyLmITE3DxTVpHfHS5a9XlSYJ'
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjKTobdTgQVhtzR2NrVTlgP6uWkitLWUzDkgfhBlqK7'
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBITv+E5xj1BbUQs0Hm71r3y3F6nS2LFfyW9T0BPHiipkaPvN0fw7nW2YbdMRot+j7Sp57W8Ctc/NU7Vy2PBqiJ8='
nb03.opendev.org:
ansible_host: 139.178.85.151
location:
cloud: openstackci-linaro-us
region_name: RegionOne
public_v4: 139.178.85.151
public_v6: 2604:1380:4111:3e54:f816:3eff:fecf:7903
host_keys:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlJ/BpaQ0B2995wGP9KhOd59Hh0wTqCDSsM8spvXuxuuLHF7gu+tlaQVG5h+CHHm3WqXO9Zq7NmnyokQOTm0LU9fm699Ij3viwd4RDTqLFCW0/AntqZFd0dxOlcIwi/qgKrtDTaKVVtyAygGDBeSEcUqZVvVEJBaxqJgrMsXPv8IjodirUG6rpzMV6rO1pISy02G0Fcey4VdEw4q+r666zX7eplhg45HA+sKt6oJJSKcvjAAGKPfXA8b0XmUOSvDzUH/5NPVwUcuB1ttJ+VRIsGriBANPXL7V4sd/wJmDjMfXTPvjsyIdaSAAM47nxdxVKPVwACFxhXvgTeOXbQDCZ'
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDJ/BRGRA2w7guMLu2v37K1iUt+JqJVAnR2vPcMGq39NeMAROqSpbadG3djwkSHT6b78q56Wl86mr5AuYjBKkcc='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjV1j8fZM0q/mjBkuzM8et4vopiF0rm9Nao9Knz+PtV'
nb04.opendev.org:
ansible_host: 140.211.169.52
location:

17
inventory/service/group_vars/bastion.yaml
View File

@ -257,22 +257,7 @@ cloud_launcher_clouds:
profiles:
- openstackci-keypairs
# Linaro (old)
- name: openstackci-linaro-us
oscc_cloud: openstackci-linaro-us
region_name: RegionOne
profiles:
- openstackci-keypairs
- openstackci-security
- name: openstackzuul-linaro-us
oscc_cloud: openstackzuul-linaro-us
region_name: RegionOne
profiles:
- openstackci-keypairs
- openstackci-security
# Linaro (new)
# Linaro
- name: opendevci-linaro
oscc_cloud: opendevci-linaro
region_name: RegionOne

4
inventory/service/host_vars/mirror02.regionone.linaro-us.opendev.org.yaml
View File

@ -1,4 +0,0 @@
letsencrypt_certs:
mirror02-regionone-linaro-us-main:
- mirror02.regionone.linaro-us.opendev.org
- mirror.regionone.linaro-us.opendev.org

2
playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
View File

@ -22,7 +22,7 @@ results:
- letsencrypt
- mailman
mirror02.regionone.linaro-us.opendev.org:
mirror01.regionone.linaro.opendev.org:
- afs-client
- kerberos-client
- letsencrypt

6
playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
View File

@ -163,9 +163,6 @@
- name: letsencrypt updated nb02-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated nb03-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated nb04-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
@ -204,9 +201,6 @@
- name: letsencrypt updated mirror01-regionone-linaro-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror02-regionone-linaro-us-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

22
playbooks/templates/clouds/bridge_all_clouds.yaml.j2
View File

@ -155,28 +155,6 @@ clouds:
project_name: '{{ clouds.openstackci_vexxhost_project_name }}'
project_domain_name: default
user_domain_name: default
openstackci-linaro-us:
regions:
- RegionOne
auth:
auth_url: https://us.linaro.cloud:5000
username: '{{ clouds.openstackci_linaro_us_username }}'
password: '{{ clouds.openstackci_linaro_us_password }}'
project_name: '{{ clouds.openstackci_linaro_us_project_name }}'
project_domain_name: default
user_domain_name: default
identity_api_version: 3
openstackzuul-linaro-us:
regions:
- RegionOne
auth:
auth_url: https://us.linaro.cloud:5000
username: '{{ clouds.openstackzuul_linaro_us_username }}'
password: '{{ clouds.openstackzuul_linaro_us_password }}'
project_name: '{{ clouds.openstackzuul_linaro_us_project_name }}'
project_domain_name: default
user_domain_name: default
identity_api_version: 3
openstackci-limestone:
regions:
- name: RegionOne

21
playbooks/templates/clouds/nodepool_clouds.yaml.j2
View File

@ -105,27 +105,6 @@ clouds:
project_domain_name: default
user_domain_name: default
image_format: 'raw'
linaro-us:
regions:
- name: RegionOne
values:
networks:
- name: "os-jobs-network"
routes_externally: false
routes_ipv6_externally: true
nat_destination: true
metrics:
statsd:
prefix: 'nodepool.task.linaro-us-regionone'
identity_api_version: '3'
auth:
auth_url: https://us.linaro.cloud:5000
username: '{{ nodepool_linaro_us_username }}'
password: '{{ nodepool_linaro_us_password }}'
project_name: '{{ nodepool_linaro_us_project }}'
project_domain_name: default
user_domain_name: default
floating_ip_source: None
limestone:
regions:
- name: RegionOne