From f18e06e011a4e225e477f06dbab3e39f0a2e95cc Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 10 Feb 2023 20:12:08 +0000 Subject: [PATCH] Farewell limestone The mirror in our Limestone Networks donor environment is now unreachable, but we ceased using this region years ago due to persistent networking trouble and the admin hasn't been around for roughly as long, so it's probably time to go ahead and say goodbye to it. Change-Id: Ibad440a3e9e5c210c70c14a34bcfec1fb24e07ce --- hiera/common.yaml | 1 - inventory/base/hosts.yaml | 11 ----- inventory/service/group_vars/bastion.yaml | 14 ------- ...ror01.regionone.limestone.opendev.org.yaml | 4 -- .../files/limestone_cacert.pem | 23 ---------- .../configure-openstacksdk/tasks/main.yaml | 1 - .../handlers/main.yaml | 3 -- .../clouds/bridge_all_clouds.yaml.j2 | 42 ------------------- .../templates/clouds/nodepool_clouds.yaml.j2 | 23 ---------- .../group_vars/control-plane-clouds.yaml.j2 | 6 --- .../templates/group_vars/nodepool.yaml.j2 | 3 -- testinfra/test_bridge.py | 2 +- 12 files changed, 1 insertion(+), 132 deletions(-) delete mode 100644 inventory/service/host_vars/mirror01.regionone.limestone.opendev.org.yaml delete mode 100644 playbooks/roles/configure-openstacksdk/files/limestone_cacert.pem diff --git a/hiera/common.yaml b/hiera/common.yaml index 8132cb8aa5..d18544a1fd 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -48,7 +48,6 @@ cacti_hosts: - mirror01.iad.rax.opendev.org - mirror01.ca-ymq-1.vexxhost.opendev.org - mirror01.sjc1.vexxhost.opendev.org -- mirror01.regionone.limestone.opendev.org - mirror.bhs1.ovh.opendev.org - mirror.gra1.ovh.opendev.org - mirror02.us-west-1.packethost.openstack.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index dedf558f97..00772202b9 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -470,17 +470,6 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDttwNdcO7kmdgI2tPWZNtj6JLhmSEkpMEsH99ZdQE1OXQnjbGeVEfaCBSFkFTbCmjAjPrjhnUWNwq+2oyNOL08N255Xn/Y0DsZSLTAH4QeB5bjtw6YwUuswUZmGUUr+/l+CNrQT7tpEtklc6Euw1+NHGKxEZ62TxucMSkZ9I1o/I/QFVsr+is32Nq1gKgU6e+U30XH9slQn7FPoKK+DQpPD+BPlMS42GHYQgPOh7ULHtim0U0x8t8MnvEJeB9F9me5BF6VzkXhOpNu99oZ3GP7i8t/JKISjxuDEnv8AMIXStHG/IS6MdagbUYa8RWStjB+79PlS/Qti72DP2FryH5T' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMyF920P6T3Sy9+q5gAaMMyPKn4fFJEcX6xYaeg73xDwVdgzmNFfovrvLK6MPRv1AnLI9vvX4zDKARLDIRYAMVg=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH9MWgDrgr4Ba9XMAwoYkIK1ZK0CwNo7tTJ9qB3G6xD+' - mirror01.regionone.limestone.opendev.org: - ansible_host: 216.245.200.130 - location: - cloud: openstackci-limestone - region_name: RegionOne - public_v4: 216.245.200.130 - public_v6: 2607:ff68:100:54:f816:3eff:feb5:4635 - host_keys: - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBE86LcF3mA2LXWHhvEQ1lAYq5PHOIt/IJAejqrYbhF/Vwy/3pSznkZpmBK5KKpiTjuDbN8YBSguDrGEIW5TgSQY=' - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDZH/p1S0ISHCJRmSmhD/Bl4FIJcNOXUsHnxMqrwTEVgWZzBeOOrHe/VFgksFO8x2KoiUTIG7QKXMqAZkyg14iqwY31mGEqhOQTAedEQ5l/kL0Te5/Do0dQ3caqSWbYIaLuDlqk42S2ekIDlUzU5GwiT9nWyAm+foX8m7SW5tGFbdva+SDP25ai5DNohnlOh/yvXL9mvMjK0mubl78rERvZd6vqnZXmedaB6Y3YV1fpvu11xMx9R6WCn5BfcVED+frHiYl6tSWWTPxiSHj59S91xkUunaW78azZvmDyAUfnwed1cQbHKWxsCtL2Jteyg7iIa0TgcK3tiaoif6LeW4Cp23uXrvNU/1DaIYgL13njTELV56zKGmMW9liXhFaiWdrP1N/wUw+SyOmBt2SQ7mLmhfBQ0WD91V/zkJXgGaw7OEGKGjeBzSAoJPCiL+yajVnweAElXYpDxNLQUdePLRwfmX1cMsK1AceOE28Jj3jrjtVjT39UzBPvP4h5sBm0jyE=' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL3VUU7tXMbOAKDNTLFUUM77i0wSnONmWwjQnuf55jlR' mirror01.regionone.osuosl.opendev.org: ansible_host: 140.211.167.73 location: diff --git a/inventory/service/group_vars/bastion.yaml b/inventory/service/group_vars/bastion.yaml index 1cb465a173..1de9025383 100644 --- a/inventory/service/group_vars/bastion.yaml +++ b/inventory/service/group_vars/bastion.yaml @@ -272,20 +272,6 @@ cloud_launcher_clouds: - openstackci-keypairs - openstackci-security - # Limestone - - name: openstackci-limestone - oscc_cloud: openstackci-limestone - region_name: RegionOne - profiles: - - openstackci-keypairs - - openstackci-security - - name: openstackzuul-limestone - oscc_cloud: openstackzuul-limestone - region_name: RegionOne - profiles: - - openstackci-keypairs - - openstackci-security - # OSUOSL - name: opendevci-osuosl oscc_cloud: opendevci-osuosl diff --git a/inventory/service/host_vars/mirror01.regionone.limestone.opendev.org.yaml b/inventory/service/host_vars/mirror01.regionone.limestone.opendev.org.yaml deleted file mode 100644 index f178ce82d2..0000000000 --- a/inventory/service/host_vars/mirror01.regionone.limestone.opendev.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - mirror01-regionone-limestone-main: - - mirror01.regionone.limestone.opendev.org - - mirror.regionone.limestone.opendev.org diff --git a/playbooks/roles/configure-openstacksdk/files/limestone_cacert.pem b/playbooks/roles/configure-openstacksdk/files/limestone_cacert.pem deleted file mode 100644 index 7c6c0dd913..0000000000 --- a/playbooks/roles/configure-openstacksdk/files/limestone_cacert.pem +++ /dev/null @@ -1,23 +0,0 @@ ------BEGIN CERTIFICATE----- -MIID2zCCAsOgAwIBAgIUYKIbVvB/nJn3zuZWRNNjMAJc/ckwDQYJKoZIhvcNAQEL -BQAwfTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFzMRQwEgYDVQQHDAtTYW4g -QW50b25pbzELMAkGA1UECgwCSVQxGjAYBgNVBAMMEW9zYS5jb250aW51b3VzLnB3 -MR8wHQYDVR0RDBZJUC4xPW9zYS5jb250aW51b3VzLnB3MB4XDTIwMDgxOTE0NTAz -N1oXDTMwMDgxNzE0NTAzN1owfTELMAkGA1UEBhMCVVMxDjAMBgNVBAgMBVRleGFz -MRQwEgYDVQQHDAtTYW4gQW50b25pbzELMAkGA1UECgwCSVQxGjAYBgNVBAMMEW9z -YS5jb250aW51b3VzLnB3MR8wHQYDVR0RDBZJUC4xPW9zYS5jb250aW51b3VzLnB3 -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu+6xC8GXVHUrffOoYcHk -hghhym6qki1XnsgH4OZ3u/9V1H3hF9s4IyYENDiMbyV0GXSQhuYRGp4vEs4sByEH -fpo1ykfQXzDDFBYI1tkQyWPk4uoUMxseTKFhPvJNarQSq6lcuvZfRQdBa5DZo3SD -2GZ421dDP4wd+Vvf6tfk5SlWRFXyhrtMqFLa6q8CeqyK5vcylPGFHnw6a2LIOFoy -xpEj+TFHHRM5/iMAdf0ASHBoGu2jNRtwHGyuEaA/h+vFpYS6dxSH48P0YEyISJjg -5oeq6ib2pKSi6W3VHnl6tbJK+VO9O7F5k1vIfFSIUqndJ9ypVyfdtknZj48r8eqt -5QIDAQABo1MwUTAdBgNVHQ4EFgQU980K827qesoI3zIUr6jGriLJWIAwHwYDVR0j -BBgwFoAU980K827qesoI3zIUr6jGriLJWIAwDwYDVR0TAQH/BAUwAwEB/zANBgkq -hkiG9w0BAQsFAAOCAQEAJnpwJOj1ih0cNUYB9Lg0yNxWBmnGMIF9APtcQturdMf6 -sk8Ekk0RFhzksGcTk7JoiUsvycXUA9RlR40dnfNS9fx/tVyuI3NmVcB4wCSFrUK7 -wCuABiI3+T+P02HQcHgdt/j+eMTWN472HJU2quJTAQDyp7WYTYLpqZpgZLW5rfad -tILoEecScVs14rW7AAILpJ3r1BOFs0eQdA90QqmUrgZqjRbugczGUC5pPUy+lLzf -9ARnhUyeVARZAiS0KiQnDSnjPYDXrUCjFqLr5eJwZSu2gEU1o6XoNeghrkfc86lC -smrK4boyJJYtkaRdFeLEi94ulTbqP7QI5J6Yi/pmIg== ------END CERTIFICATE----- diff --git a/playbooks/roles/configure-openstacksdk/tasks/main.yaml b/playbooks/roles/configure-openstacksdk/tasks/main.yaml index eedbe6c40d..f7b100f8bc 100644 --- a/playbooks/roles/configure-openstacksdk/tasks/main.yaml +++ b/playbooks/roles/configure-openstacksdk/tasks/main.yaml @@ -14,7 +14,6 @@ owner: '{{ openstacksdk_config_owner }}' src: '{{ item }}' loop: - - limestone_cacert.pem - inmotion_cacert.pem - name: Install the clouds config file diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index 2788de598c..a779ebc3db 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -207,9 +207,6 @@ - name: letsencrypt updated mirror01-ca-ymq-1-vexxhost-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml -- name: letsencrypt updated mirror01-regionone-limestone-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml - - name: letsencrypt updated mirror01-regionone-osuosl-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index f4f635bcc0..6fc671420e 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -155,48 +155,6 @@ clouds: project_name: '{{ clouds.openstackci_vexxhost_project_name }}' project_domain_name: default user_domain_name: default - openstackci-limestone: - regions: - - name: RegionOne - values: - networks: - - name: "Gateway Network" - routes_externally: false - routes_ipv6_externally: true - nat_destination: true - - name: "Flat External" - routes_externally: true - nat_source: true - auth: - auth_url: https://osa.continuous.pw:5000 - username: '{{ clouds.openstackci_limestone_username }}' - password: '{{ clouds.openstackci_limestone_password }}' - project_name: '{{ clouds.openstackci_limestone_project_name }}' - user_domain_name: default - project_domain_name: default - identity_api_version: 3 - cacert: /etc/openstack/limestone_cacert.pem - openstackzuul-limestone: - regions: - - name: RegionOne - values: - networks: - - name: "Gateway Network" - routes_externally: false - routes_ipv6_externally: true - nat_destination: true - - name: "Flat External" - routes_externally: true - nat_source: true - auth: - auth_url: https://osa.continuous.pw:5000 - username: '{{ clouds.openstackzuul_limestone_username }}' - password: '{{ clouds.openstackzuul_limestone_password }}' - project_name: '{{ clouds.openstackzuul_limestone_project_name }}' - user_domain_name: default - project_domain_name: default - identity_api_version: 3 - cacert: /etc/openstack/limestone_cacert.pem openstackci-packethost: regions: - name: us-west-1 diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 4cde297843..9303c77f3e 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -105,29 +105,6 @@ clouds: project_domain_name: default user_domain_name: default image_format: 'raw' - limestone: - regions: - - name: RegionOne - values: - networks: - - name: "Gateway Network" - routes_externally: false - routes_ipv6_externally: true - nat_destination: true - metrics: - statsd: - prefix: 'nodepool.task.limestone-regionone' - auth: - auth_url: https://osa.continuous.pw:5000 - username: '{{ nodepool_limestone_username }}' - password: '{{ nodepool_limestone_password }}' - project_name: '{{ nodepool_limestone_project }}' - user_domain_name: default - project_domain_name: default - api_timeout: 60 - identity_api_version: 3 - floating_ip_source: None - cacert: {{ openstacksdk_config_dir }}/limestone_cacert.pem packethost: regions: - name: us-west-1 diff --git a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 index bb629d8cfb..2ac3540379 100644 --- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 @@ -40,12 +40,6 @@ clouds: openstackzuul_linaro_us_username: user openstackzuul_linaro_us_password: password openstackzuul_linaro_us_project_name: project - openstackci_limestone_username: user - openstackci_limestone_password: password - openstackci_limestone_project_name: project - openstackzuul_limestone_username: user - openstackzuul_limestone_password: password - openstackzuul_limestone_project_name: project openstackci_packethost_username: user openstackci_packethost_password: password openstackci_packethost_project_name: project diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 index a2d99ef4be..ee50744ce9 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -45,9 +45,6 @@ nodepool_linaro_project: project nodepool_linaro_us_username: user nodepool_linaro_us_password: password nodepool_linaro_us_project: project -nodepool_limestone_username: user -nodepool_limestone_password: password -nodepool_limestone_project: project nodepool_packethost_username: user nodepool_packethost_password: password nodepool_packethost_project: project diff --git a/testinfra/test_bridge.py b/testinfra/test_bridge.py index 3b0d548bb8..0f16ed4cc2 100644 --- a/testinfra/test_bridge.py +++ b/testinfra/test_bridge.py @@ -38,7 +38,7 @@ def test_openstacksdk_config(host): assert f.mode == 0o750 del f - f = host.file('/etc/openstack/limestone_cacert.pem') + f = host.file('/etc/openstack/inmotion_cacert.pem') assert f.exists assert f.is_file assert f.user == 'root'