opendev/system-config
Code Issues Proposed changes

Merge "Override RAX block storage endpoint"

Browse Source
This commit is contained in:
Zuul 2020-03-24 22:46:52 +00:00 committed by Gerrit Code Review
commit 033c4b771e
3 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
playbooks/templates/clouds/bridge_all_clouds.yaml.j2
View File

@ -65,28 +65,40 @@ clouds:
project_name: '{{ clouds.openstackci_ovh_project_name }}' project_name: '{{ clouds.openstackci_ovh_project_name }}'
openstackci-rax: openstackci-rax:
regions: regions:
- DFW - name: DFW
- ORD values:
- IAD 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 profile: rackspace
auth: auth:
username: '{{ clouds.openstackci_rax_username }}' username: '{{ clouds.openstackci_rax_username }}'
password: '{{ clouds.openstackci_rax_password }}' password: '{{ clouds.openstackci_rax_password }}'
project_id: '{{ clouds.openstackci_rax_project_id }}' project_id: '{{ clouds.openstackci_rax_project_id }}'
identity_api_version: 2 identity_api_version: 2
volume_api_version: 1 volume_api_version: 2
openstackjenkins-rax: openstackjenkins-rax:
regions: regions:
- DFW - name: DFW
- ORD values:
- IAD 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 profile: rackspace
auth: auth:
username: '{{ clouds.openstackjenkins_rax_username }}' username: '{{ clouds.openstackjenkins_rax_username }}'
password: '{{ clouds.openstackjenkins_rax_password }}' password: '{{ clouds.openstackjenkins_rax_password }}'
project_id: '{{ clouds.openstackjenkins_rax_project_id }}' project_id: '{{ clouds.openstackjenkins_rax_project_id }}'
identity_api_version: 2 identity_api_version: 2
volume_api_version: 1 volume_api_version: 2
openstackjenkins-ovh: openstackjenkins-ovh:
regions: regions:
- GRA1 - GRA1

14
playbooks/templates/clouds/bridge_clouds.yaml.j2
View File

@ -52,16 +52,22 @@ clouds:
project_name: '{{ clouds.openstackci_ovh_project_name }}' project_name: '{{ clouds.openstackci_ovh_project_name }}'
openstackci-rax: openstackci-rax:
regions: regions:
- DFW - name: DFW
- ORD values:
- IAD 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 profile: rackspace
auth: auth:
username: '{{ clouds.openstackci_rax_username }}' username: '{{ clouds.openstackci_rax_username }}'
password: '{{ clouds.openstackci_rax_password }}' password: '{{ clouds.openstackci_rax_password }}'
project_id: '{{ clouds.openstackci_rax_project_id }}' project_id: '{{ clouds.openstackci_rax_project_id }}'
identity_api_version: 2 identity_api_version: 2
volume_api_version: 1 volume_api_version: 2
openstackci-vexxhost: openstackci-vexxhost:
regions: regions:
- ca-ymq-1 - ca-ymq-1

14
playbooks/templates/clouds/nodepool_clouds.yaml.j2
View File

@ -20,9 +20,15 @@ clouds:
rax: rax:
profile: rackspace profile: rackspace
regions: regions:
- DFW - name: DFW
- ORD values:
- IAD 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 api_timeout: 60
auth: auth:
username: '{{ nodepool_rackspace_username }}' username: '{{ nodepool_rackspace_username }}'
@ -30,7 +36,7 @@ clouds:
project_id: '{{ nodepool_rackspace_project }}' project_id: '{{ nodepool_rackspace_project }}'
force_ipv4: true force_ipv4: true
identity_api_version: 2 identity_api_version: 2
volume_api_version: 1 volume_api_version: 2
ovh: ovh:
profile: ovh profile: ovh
# OVH has a weird new ipv6 setup that we can't handle properly # OVH has a weird new ipv6 setup that we can't handle properly