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'