diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index c87f2b219e..3a412ae14e 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -569,13 +569,6 @@ all: region_name: RegionOne public_v4: 216.245.200.132 public_v6: 2607:ff68:100:54:f816:3eff:febd:b93 - mirror01.regionone.fortnebula.opendev.org: - ansible_host: 108.44.198.37 - location: - cloud: openstackci-fortnebula - region_name: regionOne - public_v4: 108.44.198.37 - public_v6: 2001:470:e045:2:f816:3eff:fee6:691d mirror01.kna1.airship-citycloud.opendev.org: ansible_host: 188.212.109.64 location: diff --git a/modules/openstack_project/files/ssl_cert_check/ssldomains b/modules/openstack_project/files/ssl_cert_check/ssldomains index 5bf779670a..e3df477ae3 100644 --- a/modules/openstack_project/files/ssl_cert_check/ssldomains +++ b/modules/openstack_project/files/ssl_cert_check/ssldomains @@ -32,7 +32,6 @@ mirror.dfw.rax.opendev.org 443 mirror.gra1.ovh.opendev.org mirror.mtl01.inap.opendev.org 443 mirror.ord.rax.opendev.org 443 -mirror.regionone.fortnebula.opendev.org 443 mirror.regionone.linaro-us.opendev.org 443 nova.openstack.org 443 opendev.org 443 diff --git a/playbooks/clouds_layouts.yml b/playbooks/clouds_layouts.yml index d2ddb96bce..ea878a80c7 100644 --- a/playbooks/clouds_layouts.yml +++ b/playbooks/clouds_layouts.yml @@ -364,16 +364,16 @@ clouds: - openstackci-keypairs - openstackci-security - # Fortnebula - - name: openstackci-fortnebula - oscc_cloud: openstackci-fortnebula - region_name: regionOne + # Open Edge + - name: openstackci-openedge + oscc_cloud: openstackci-openedge + region_name: us-east profiles: - openstackci-keypairs - openstackci-security - - name: openstackzuul-fortnebula - oscc_cloud: openstackzuul-fortnebula - region_name: regionOne + - name: openstackzuul-openedge + oscc_cloud: openstackzuul-openedge + region_name: us-east profiles: - openstackci-keypairs - openstackci-security diff --git a/playbooks/host_vars/mirror01.regionone.fortnebula.opendev.org.yaml b/playbooks/host_vars/mirror01.regionone.fortnebula.opendev.org.yaml deleted file mode 100644 index 4eb482bd63..0000000000 --- a/playbooks/host_vars/mirror01.regionone.fortnebula.opendev.org.yaml +++ /dev/null @@ -1,5 +0,0 @@ -ansible_python_interpreter: python3 -letsencrypt_certs: - mirror01-regionone-fortnebula-main: - - mirror01.regionone.fortnebula.opendev.org - - mirror.regionone.fortnebula.opendev.org diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index 971ae3f185..32b6c88e51 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -137,9 +137,6 @@ - name: letsencrypt updated mirror01-gra1-ovh-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml -- name: letsencrypt updated mirror01-regionone-fortnebula-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml - - name: letsencrypt updated mirror01-regionone-linaro-us-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 1a966698dc..b3d89cc077 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -268,28 +268,28 @@ clouds: user_domain_name: default project_domain_name: default identity_api_version: '3' - openstackci-fortnebula: + openstackci-openedge: regions: - - regionOne + - us-east api_timeout: 60 auth: - auth_url: https://openstack.fortnebula.com:13000/v3 - username: '{{ clouds.openstackci_fortnebula_username }}' - password: '{{ clouds.openstackci_fortnebula_password }}' - project_name: '{{ clouds.openstackci_fortnebula_project_name }}' + 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-fortnebula: + openstackzuul-openedge: regions: - - regionOne + - us-east api_timeout: 60 auth: - auth_url: https://openstack.fortnebula.com:13000/v3 - username: '{{ clouds.openstackzuul_fortnebula_username }}' - password: '{{ clouds.openstackzuul_fortnebula_password }}' - project_name: '{{ clouds.openstackzuul_fortnebula_project_name }}' + 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 diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2 index 3d48e3b5f7..75e9ea2cd0 100644 --- a/playbooks/templates/clouds/bridge_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2 @@ -147,15 +147,15 @@ clouds: user_domain_name: default project_domain_name: default identity_api_version: '3' - openstackci-fortnebula: + openstackci-openedge: regions: - - regionOne + - us-east api_timeout: 60 auth: - auth_url: https://openstack.fortnebula.com:13000/v3 - username: '{{ clouds.openstackci_fortnebula_username }}' - password: '{{ clouds.openstackci_fortnebula_password }}' - project_name: '{{ clouds.openstackci_fortnebula_project_name }}' + 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 diff --git a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 index 00d70f1d51..9c0e3f452f 100644 --- a/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_builder_clouds.yaml.j2 @@ -172,9 +172,9 @@ clouds: project_domain_name: default identity_api_version: '3' image_format: 'raw' - fortnebula: + openedge: regions: - - name: regionOne + - name: us-east values: networks: - name: openstackzuul @@ -183,10 +183,10 @@ clouds: nat_destination: true api_timeout: 60 auth: - auth_url: https://openstack.fortnebula.com:13000/v3 - username: '{{ nodepool_fortnebula_username }}' - password: '{{ nodepool_fortnebula_password }}' - project_name: '{{ nodepool_fortnebula_project }}' + 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 diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 3c46376d79..cfab56bf90 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -147,9 +147,9 @@ clouds: project_domain_name: default identity_api_version: '3' image_format: 'raw' - fortnebula: + openedge: regions: - - name: regionOne + - name: us-east values: networks: - name: openstackzuul @@ -158,10 +158,10 @@ clouds: nat_destination: true api_timeout: 60 auth: - auth_url: https://openstack.fortnebula.com:13000/v3 - username: '{{ nodepool_fortnebula_username }}' - password: '{{ nodepool_fortnebula_password }}' - project_name: '{{ nodepool_fortnebula_project }}' + 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 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 2c49df1ce1..30f659be48 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,12 @@ clouds: openstackzuul_packethost_username: user openstackzuul_packethost_password: password openstackzuul_packethost_project_name: project - openstackci_fortnebula_username: user - openstackci_fortnebula_password: password - openstackci_fortnebula_project_name: project - openstackzuul_fortnebula_username: user - openstackzuul_fortnebula_password: password - openstackzuul_fortnebula_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 a24e924f05..8a5e44997b 100644 --- a/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/nodepool.yaml.j2 @@ -26,8 +26,8 @@ nodepool_limestone_project: project nodepool_packethost_username: user nodepool_packethost_password: password nodepool_packethost_project: project -nodepool_fortnebula_username: user -nodepool_fortnebula_password: password -nodepool_fortnebula_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 26a7973d24..e9dabe00ec 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,12 @@ clouds: openstackzuul_packethost_username: user openstackzuul_packethost_password: password openstackzuul_packethost_project_name: project - openstackci_fortnebula_username: user - openstackci_fortnebula_password: password - openstackci_fortnebula_project_name: project - openstackzuul_fortnebula_username: user - openstackzuul_fortnebula_password: password - openstackzuul_fortnebula_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