diff --git a/inventory/service/group_vars/bastion.yaml b/inventory/service/group_vars/bastion.yaml index 9faa79460b..8a116f9115 100644 --- a/inventory/service/group_vars/bastion.yaml +++ b/inventory/service/group_vars/bastion.yaml @@ -214,30 +214,6 @@ cloud_launcher_clouds: - openstackci-keypairs # rackspace flex - - name: opendevci-raxflex-sjc3 - oscc_cloud: opendevci-raxflex - region_name: SJC3 - profiles: - - openstackci-keypairs - - openstackci-security - - opendevci-networking - routers: - - name: opendevci-router1 - network: PUBLICNET - interfaces: - - opendevci-subnet1 - - name: opendevzuul-raxflex-sjc3 - oscc_cloud: opendevzuul-raxflex - region_name: SJC3 - profiles: - - openstackci-keypairs - - openstackci-security - - opendevzuul-networking - routers: - - name: opendevzuul-router1 - network: PUBLICNET - interfaces: - - opendevzuul-subnet1 - name: opendevci-rax-flex-dfw3 oscc_cloud: opendevci-rax-flex region_name: DFW3 @@ -245,6 +221,7 @@ cloud_launcher_clouds: - openstackci-keypairs - openstackci-security - opendevci-networking + # we manually set the MTU to 1500 since it's unusually high otherwise routers: - name: opendevci-router1 network: PUBLICNET @@ -257,6 +234,7 @@ cloud_launcher_clouds: - openstackci-keypairs - openstackci-security - opendevci-networking + # we manually set the MTU to 1500 since it's unusually high otherwise routers: - name: opendevci-router1 network: PUBLICNET @@ -269,6 +247,7 @@ cloud_launcher_clouds: - openstackci-keypairs - openstackci-security - opendevzuul-networking + # we manually set the MTU to 1500 since it's unusually high otherwise routers: - name: opendevzuul-router1 network: PUBLICNET @@ -281,6 +260,7 @@ cloud_launcher_clouds: - openstackci-keypairs - openstackci-security - opendevzuul-networking + # we manually set the MTU to 1500 since it's unusually high otherwise routers: - name: opendevzuul-router1 network: PUBLICNET diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index e827f3b763..0fd6ef00e1 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -70,24 +70,6 @@ clouds: project_id: '{{ clouds.openstackjenkins_rax_project_id }}' auth_type: 'rackspace_apikey' volume_api_version: 2 - opendevci-raxflex: - regions: - - name: SJC3 - auth: - auth_url: 'https://keystone.api.sjc3.rackspacecloud.com/v3' - project_id: '{{ clouds.opendevci_raxflex_project_id }}' - username: '{{ clouds.opendevci_raxflex_username }}' - password: '{{ clouds.opendevci_raxflex_key }}' - user_domain_name: rackspace_cloud_domain - opendevzuul-raxflex: - regions: - - name: SJC3 - auth: - auth_url: 'https://keystone.api.sjc3.rackspacecloud.com/v3' - project_id: '{{ clouds.opendevzuul_raxflex_project_id }}' - username: '{{ clouds.opendevzuul_raxflex_username }}' - password: '{{ clouds.opendevzuul_raxflex_key }}' - user_domain_name: rackspace_cloud_domain opendevci-rax-flex: regions: - name: DFW3 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 5a6d7b5eab..3305578ca5 100644 --- a/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/control-plane-clouds.yaml.j2 @@ -6,18 +6,12 @@ clouds: openstackci_rax_username: user openstackci_rax_key: apikey openstackci_rax_project_id: project - opendevci_raxflex_username: user - opendevci_raxflex_key: apikey - opendevci_raxflex_project_id: project opendevci_rax_flex_username: user opendevci_rax_flex_key: apikey opendevci_rax_flex_project_id: project openstackjenkins_rax_username: user openstackjenkins_rax_key: apikey openstackjenkins_rax_project_id: project - opendevzuul_raxflex_username: user - opendevzuul_raxflex_key: apikey - opendevzuul_raxflex_project_id: project opendevzuul_rax_flex_username: user opendevzuul_rax_flex_key: apikey opendevzuul_rax_flex_project_id: project