diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index b3d89cc077..da377fe297 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -65,28 +65,40 @@ clouds: project_name: '{{ clouds.openstackci_ovh_project_name }}' openstackci-rax: regions: - - DFW - - ORD - - IAD + - name: DFW + values: + block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackci_rax_project_id }}/' + - name: ORD + values: + block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackci_rax_project_id }}/' + - name: IAD + values: + block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackci_rax_project_id }}/' profile: rackspace auth: username: '{{ clouds.openstackci_rax_username }}' password: '{{ clouds.openstackci_rax_password }}' project_id: '{{ clouds.openstackci_rax_project_id }}' identity_api_version: 2 - volume_api_version: 1 + volume_api_version: 2 openstackjenkins-rax: regions: - - DFW - - ORD - - IAD + - name: DFW + values: + block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackjenkins_rax_project_id }}/' + - name: ORD + values: + block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackjenkins_rax_project_id }}/' + - name: IAD + values: + block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackjenkins_rax_project_id }}/' profile: rackspace auth: username: '{{ clouds.openstackjenkins_rax_username }}' password: '{{ clouds.openstackjenkins_rax_password }}' project_id: '{{ clouds.openstackjenkins_rax_project_id }}' identity_api_version: 2 - volume_api_version: 1 + volume_api_version: 2 openstackjenkins-ovh: regions: - GRA1 diff --git a/playbooks/templates/clouds/bridge_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_clouds.yaml.j2 index 75e9ea2cd0..a020787e07 100644 --- a/playbooks/templates/clouds/bridge_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_clouds.yaml.j2 @@ -52,16 +52,22 @@ clouds: project_name: '{{ clouds.openstackci_ovh_project_name }}' openstackci-rax: regions: - - DFW - - ORD - - IAD + - name: DFW + values: + block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackci_rax_project_id }}/' + - name: ORD + values: + block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackci_rax_project_id }}' + - name: IAD + values: + block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackci_rax_project_id }}' profile: rackspace auth: username: '{{ clouds.openstackci_rax_username }}' password: '{{ clouds.openstackci_rax_password }}' project_id: '{{ clouds.openstackci_rax_project_id }}' identity_api_version: 2 - volume_api_version: 1 + volume_api_version: 2 openstackci-vexxhost: regions: - ca-ymq-1 diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 9b2533a487..2f080acd09 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -20,9 +20,15 @@ clouds: rax: profile: rackspace regions: - - DFW - - ORD - - IAD + - name: DFW + values: + block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/{{ nodepool_rackspace_project }}/' + - name: ORD + values: + block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/{{ nodepool_rackspace_project }}/' + - name: IAD + values: + block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/{{ nodepool_rackspace_project }}/' api_timeout: 60 auth: username: '{{ nodepool_rackspace_username }}' @@ -30,7 +36,7 @@ clouds: project_id: '{{ nodepool_rackspace_project }}' force_ipv4: true identity_api_version: 2 - volume_api_version: 1 + volume_api_version: 2 ovh: profile: ovh # OVH has a weird new ipv6 setup that we can't handle properly