diff --git a/hiera/common.yaml b/hiera/common.yaml index f44a8c49c7..e68b40397d 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -288,7 +288,6 @@ cacti_hosts: - mirror.mtl01.inap.opendev.org - mirror02.us-west-1.packethost.openstack.org - mirror02.regionone.linaro-us.opendev.org -- mirror.us-east.openedge.opendev.org - mirror-update.opendev.org - mirror-update.openstack.org - refstack01.openstack.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index ea21b5fc75..5e43963219 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -529,13 +529,6 @@ all: region_name: kna1 public_v4: 188.212.109.26 public_v6: '' - mirror01.us-east.openedge.opendev.org: - ansible_host: 108.44.198.36 - location: - cloud: openstackci-openedge - region_name: us-east - public_v4: 108.44.198.36 - public_v6: 2001:470:e126:0:f816:3eff:fecd:ebe6 nb01.opendev.org: ansible_host: 104.239.240.55 location: diff --git a/inventory/service/host_vars/bridge.openstack.org.yaml b/inventory/service/host_vars/bridge.openstack.org.yaml index 606a518d98..df66b3caef 100644 --- a/inventory/service/host_vars/bridge.openstack.org.yaml +++ b/inventory/service/host_vars/bridge.openstack.org.yaml @@ -284,20 +284,6 @@ cloud_launcher_clouds: - openstackci-keypairs - openstackci-security - # Open Edge - - name: openstackci-openedge - oscc_cloud: openstackci-openedge - region_name: us-east - profiles: - - openstackci-keypairs - - openstackci-security - - name: openstackzuul-openedge - oscc_cloud: openstackzuul-openedge - region_name: us-east - profiles: - - openstackci-keypairs - - openstackci-security - - name: opendevci-airship-kna1 oscc_cloud: opendevci-airship region_name: Kna1 diff --git a/inventory/service/host_vars/mirror01.us-east.openedge.opendev.org.yaml b/inventory/service/host_vars/mirror01.us-east.openedge.opendev.org.yaml deleted file mode 100644 index 0462efbda6..0000000000 --- a/inventory/service/host_vars/mirror01.us-east.openedge.opendev.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - mirror01-us-east-openedge-main: - - mirror01.us-east.openedge.opendev.org - - mirror.us-east.openedge.opendev.org diff --git a/modules/openstack_project/files/ssl_cert_check/ssldomains b/modules/openstack_project/files/ssl_cert_check/ssldomains index 90f226f780..3561aff134 100644 --- a/modules/openstack_project/files/ssl_cert_check/ssldomains +++ b/modules/openstack_project/files/ssl_cert_check/ssldomains @@ -35,7 +35,6 @@ mirror.gra1.ovh.opendev.org 443 mirror.mtl01.inap.opendev.org 443 mirror.ord.rax.opendev.org 443 mirror.regionone.linaro-us.opendev.org 443 -mirror.us-east.openedge.opendev.org 443 mirror.sjc1.vexxhost.opendev.org 443 mirror.ca-ymq-1.vexxhost.opendev.org 443 mirror.regionone.limestone.opendev.org 443 diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index 46d314e986..026bf459c6 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -178,9 +178,6 @@ - name: letsencrypt updated mirror01-kna1-airship-citycloud-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml -- name: letsencrypt updated mirror01-us-east-openedge-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.yam diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index 3a2b3f6d89..3e6baed8a4 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -222,32 +222,6 @@ clouds: user_domain_name: default project_domain_name: default identity_api_version: '3' - openstackci-openedge: - regions: - - us-east - api_timeout: 60 - auth: - auth_url: https://api.us-east.open-edge.io:5000/v3 - username: '{{ clouds.openstackci_openedge_username }}' - password: '{{ clouds.openstackci_openedge_password }}' - project_name: '{{ clouds.openstackci_openedge_project_name }}' - project_domain_name: Default - user_domain_name: Default - identity_api_version: 3 - image_format: 'qcow2' - openstackzuul-openedge: - regions: - - us-east - api_timeout: 60 - auth: - auth_url: https://api.us-east.open-edge.io:5000/v3 - username: '{{ clouds.openstackzuul_openedge_username }}' - password: '{{ clouds.openstackzuul_openedge_password }}' - project_name: '{{ clouds.openstackzuul_openedge_project_name }}' - project_domain_name: Default - user_domain_name: Default - identity_api_version: 3 - image_format: 'qcow2' opendevci-airship: regions: - Kna1 diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index f3c970e8a4..5cf872484c 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -132,26 +132,6 @@ clouds: project_domain_name: default identity_api_version: '3' image_format: 'raw' - openedge: - regions: - - name: us-east - values: - networks: - - name: openstackzuul - routes_externally: false - routes_ipv6_externally: true - nat_destination: true - api_timeout: 60 - auth: - auth_url: https://api.us-east.open-edge.io:5000/v3 - username: '{{ nodepool_openedge_username }}' - password: '{{ nodepool_openedge_password }}' - project_name: '{{ nodepool_openedge_project }}' - project_domain_name: Default - user_domain_name: Default - identity_api_version: 3 - floating_ip_source: None - image_format: 'qcow2' airship-citycloud: regions: - Kna1 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 c5a2eacd65..e39ec5be98 100644 --- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 @@ -48,12 +48,6 @@ clouds: openstackzuul_packethost_username: user openstackzuul_packethost_password: password openstackzuul_packethost_project_name: project - openstackci_openedge_username: user - openstackci_openedge_password: password - openstackci_openedge_project_name: project - openstackzuul_openedge_username: user - openstackzuul_openedge_password: password - openstackzuul_openedge_project_name: project opendevci_airship_username: user opendevci_airship_password: password opendevzuul_airship_username: user diff --git a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 index 2c1f747942..d0a4ac39c4 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -56,8 +56,5 @@ nodepool_limestone_project: project nodepool_packethost_username: user nodepool_packethost_password: password nodepool_packethost_project: project -nodepool_openedge_username: user -nodepool_openedge_password: password -nodepool_openedge_project: project nodepool_airship_username: user nodepool_airship_password: password 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 61ec3c3597..809a0f3e77 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_openedge_username: user - openstackci_openedge_password: password - openstackci_openedge_project_name: project - openstackzuul_openedge_username: user - openstackzuul_openedge_password: password - openstackzuul_openedge_project_name: project opendevci_airship_username: user opendevci_airship_password: password opendevzuul_airship_username: user