From 7740dfef14ba941c53185cc08f2b196955b98789 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Wed, 26 Oct 2022 15:02:16 +0000 Subject: [PATCH] Correct block_storage_endpoint_override for rax We've incorrectly embedded the project ID in our block storage endpoint override for Rackspace Public Cloud, which leads to a 404 Not Found response since the SDK appends the supplied project_id already. Removing this allows to use latest versions of the OpenStack CLI/SDK for volume management in Rackspace Public Cloud, so long as we pin python-cinderclient<8 (for v2 API support). Change-Id: If37f1a848ec4d3128784ed28068bfae9f06e2f14 --- playbooks/templates/clouds/bridge_all_clouds.yaml.j2 | 12 ++++++------ playbooks/templates/clouds/nodepool_clouds.yaml.j2 | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 index dca1d3bf61..4522705620 100644 --- a/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 +++ b/playbooks/templates/clouds/bridge_all_clouds.yaml.j2 @@ -86,13 +86,13 @@ clouds: regions: - name: DFW values: - block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackci_rax_project_id }}/' + block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/' - name: ORD values: - block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackci_rax_project_id }}/' + block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/' - name: IAD values: - block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackci_rax_project_id }}/' + block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/' profile: rackspace auth: username: '{{ clouds.openstackci_rax_username }}' @@ -104,13 +104,13 @@ clouds: regions: - name: DFW values: - block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackjenkins_rax_project_id }}/' + block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/' - name: ORD values: - block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackjenkins_rax_project_id }}/' + block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/' - name: IAD values: - block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/{{ clouds.openstackjenkins_rax_project_id }}/' + block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/' profile: rackspace auth: username: '{{ clouds.openstackjenkins_rax_username }}' diff --git a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 index 165a196a86..1b0170420e 100644 --- a/playbooks/templates/clouds/nodepool_clouds.yaml.j2 +++ b/playbooks/templates/clouds/nodepool_clouds.yaml.j2 @@ -22,19 +22,19 @@ clouds: regions: - name: DFW values: - block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/{{ nodepool_rackspace_project }}/' + block_storage_endpoint_override: 'https://dfw.blockstorage.api.rackspacecloud.com/v2/' metrics: statsd: prefix: 'nodepool.task.rax-dfw' - name: ORD values: - block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/{{ nodepool_rackspace_project }}/' + block_storage_endpoint_override: 'https://ord.blockstorage.api.rackspacecloud.com/v2/' metrics: statsd: prefix: 'nodepool.task.rax-ord' - name: IAD values: - block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/{{ nodepool_rackspace_project }}/' + block_storage_endpoint_override: 'https://iad.blockstorage.api.rackspacecloud.com/v2/' metrics: statsd: prefix: 'nodepool.task.rax-iad'