diff --git a/inventory/groups.yaml b/inventory/groups.yaml index 17c9fbee95..89b0e9c4a3 100644 --- a/inventory/groups.yaml +++ b/inventory/groups.yaml @@ -173,7 +173,7 @@ groups: - logstash-worker[0-9]*.open*.org - logstash[0-9]*.open*.org - mirror-update[0-9]*.openstack.org - - ^mirror[0-9].*\..*\.(?!linaro|linaro-london|arm64ci).*\.openstack\.org + - ^mirror[0-9].*\..*\.(?!linaro|linaro-london).*\.openstack\.org - ^nb(?!03)[0-9]*\.open.*\.org - nl[0-9]*.open*.org - openstackid[0-9]*.openstack.org diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index a70aa57427..aa5c2dcf40 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -252,30 +252,6 @@ clouds: user_domain_name: default project_domain_name: default identity_api_version: '3' - openstackci-arm64ci: - regions: - - nrt1 - auth: - auth_url: https://arm64ci.cloud:5000 - username: '{{ clouds.openstackci_arm64ci_username }}' - password: '{{ clouds.openstackci_arm64ci_password }}' - project_name: '{{ clouds.openstackci_arm64ci_project_name }}' - project_domain_name: openstack-infra - user_domain_name: openstack-infra - interface: public - identity_api_version: '3' - openstackzuul-arm64ci: - regions: - - nrt1 - auth: - auth_url: https://arm64ci.cloud:5000 - username: '{{ clouds.openstackzuul_arm64ci_username }}' - password: '{{ clouds.openstackzuul_arm64ci_password }}' - project_name: '{{ clouds.openstackzuul_arm64ci_project_name }}' - project_domain_name: openstack-infra - user_domain_name: openstack-infra - interface: public - identity_api_version: '3' openstackci-fortnebula: regions: - regionOne diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2 index 0333ab30f3..02504b71e6 100644 --- a/playbooks/templates/clouds/bridge_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2 @@ -134,18 +134,6 @@ clouds: user_domain_name: default project_domain_name: default identity_api_version: '3' - openstackci-arm64ci: - regions: - - nrt1 - auth: - auth_url: https://arm64ci.cloud:5000 - username: '{{ clouds.openstackci_arm64ci_username }}' - password: '{{ clouds.openstackci_arm64ci_password }}' - project_name: '{{ clouds.openstackci_arm64ci_project_name }}' - project_domain_name: openstack-infra - user_domain_name: openstack-infra - interface: public - identity_api_version: '3' openstackci-fortnebula: regions: - regionOne diff --git a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 index f2e9fd4738..974a34fab4 100644 --- a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 @@ -157,18 +157,6 @@ clouds: project_domain_name: default identity_api_version: '3' image_format: 'raw' - arm64ci: - regions: - - nrt1 - identity_api_version: '3' - auth: - auth_url: https://arm64ci.cloud:5000 - username: '{{ nodepool_arm64ci_username }}' - password: '{{ nodepool_arm64ci_password }}' - project_name: '{{ nodepool_arm64ci_project }}' - project_domain_name: openstack-infra - user_domain_name: openstack-infra - interface: public fortnebula: regions: - name: regionOne diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 1150ed12e7..856716495f 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -134,18 +134,6 @@ clouds: project_domain_name: default identity_api_version: '3' image_format: 'raw' - arm64ci: - regions: - - nrt1 - identity_api_version: '3' - auth: - auth_url: https://arm64ci.cloud:5000 - username: '{{ nodepool_arm64ci_username }}' - password: '{{ nodepool_arm64ci_password }}' - project_name: '{{ nodepool_arm64ci_project }}' - project_domain_name: openstack-infra - user_domain_name: openstack-infra - interface: public fortnebula: regions: - name: regionOne 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 e9cbaa682e..643ec74c18 100644 --- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 @@ -52,12 +52,6 @@ clouds: openstackzuul_packethost_username: user openstackzuul_packethost_password: password openstackzuul_packethost_project_name: project - openstackci_arm64ci_username: user - openstackci_arm64ci_password: password - openstackci_arm64ci_project_name: project - openstackzuul_arm64ci_username: user - openstackzuul_arm64ci_password: password - openstackzuul_arm64ci_project_name: project openstackci_fortnebula_username: user openstackci_fortnebula_password: password openstackci_fortnebula_project_name: project diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 index 33c51e9ac9..5946e6ec4c 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -26,9 +26,6 @@ nodepool_limestone_project: project nodepool_packethost_username: user nodepool_packethost_password: password nodepool_packethost_project: project -nodepool_arm64ci_username: user -nodepool_arm64ci_password: password -nodepool_arm64ci_project: project nodepool_fortnebula_username: user nodepool_fortnebula_password: password nodepool_fortnebula_project: project diff --git a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 index 20d7e28c5d..d7b95798cb 100644 --- a/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 +++ b/playbooks/zuul/templates/host_vars/bridge.openstack.org.yaml.j2 @@ -52,12 +52,6 @@ clouds: openstackzuul_packethost_username: user openstackzuul_packethost_password: password openstackzuul_packethost_project_name: project - openstackci_arm64ci_username: user - openstackci_arm64ci_password: password - openstackci_arm64ci_project_name: project - openstackzuul_arm64ci_username: user - openstackzuul_arm64ci_password: password - openstackzuul_arm64ci_project_name: project openstackci_fortnebula_username: user openstackci_fortnebula_password: password openstackci_fortnebula_project_name: project