opendev/system-config
Code Issues Proposed changes

Merge "Move api_timeout into clouds.yaml for nodepool"

Browse Source
This commit is contained in:
Zuul 2017-12-18 20:49:15 +00:00 committed by Gerrit Code Review
commit e8e341551a
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openstack_project/templates/nodepool/clouds.yaml.erb
View File

@ -10,6 +10,7 @@ clouds:
- DFW - DFW
- ORD - ORD
- IAD - IAD
api_timeout: 60
auth: auth:
username: '<%= @rackspace_username %>' username: '<%= @rackspace_username %>'
password: '<%= @rackspace_password %>' password: '<%= @rackspace_password %>'
@ -23,12 +24,14 @@ clouds:
regions: regions:
- BHS1 - BHS1
- GRA1 - GRA1
api_timeout: 60
auth: auth:
username: '<%= @ovh_username %>' username: '<%= @ovh_username %>'
password: '<%= @ovh_password %>' password: '<%= @ovh_password %>'
project_name: '<%= @ovh_project %>' project_name: '<%= @ovh_project %>'
tripleo-test-cloud-rh1: tripleo-test-cloud-rh1:
region_name: regionOne region_name: regionOne
api_timeout: 60
auth: auth:
auth_url: https://ci-overcloud.rh1.tripleo.org:13000 auth_url: https://ci-overcloud.rh1.tripleo.org:13000
username: '<%= @tripleo_username %>' username: '<%= @tripleo_username %>'
@ -40,6 +43,7 @@ clouds:
identity_api_version: '3' identity_api_version: '3'
tripleo-test-cloud-rh2: tripleo-test-cloud-rh2:
region_name: regionOne region_name: regionOne
api_timeout: 60
auth: auth:
username: '<%= @tripleo_username %>' username: '<%= @tripleo_username %>'
password: '<%= @tripleo_password %>' password: '<%= @tripleo_password %>'
@ -48,6 +52,7 @@ clouds:
floating_ip_source: neutron floating_ip_source: neutron
inap: inap:
profile: internap profile: internap
api_timeout: 60
auth: auth:
username: '<%= @internap_username %>' username: '<%= @internap_username %>'
password: '<%= @internap_password %>' password: '<%= @internap_password %>'
@ -61,11 +66,13 @@ clouds:
vexxhost: vexxhost:
region_name: ca-ymq-1 region_name: ca-ymq-1
profile: vexxhost profile: vexxhost
api_timeout: 60
auth: auth:
username: '<%= @vexxhost_username %>' username: '<%= @vexxhost_username %>'
password: '<%= @vexxhost_password %>' password: '<%= @vexxhost_password %>'
project_name: '<%= @vexxhost_project %>' project_name: '<%= @vexxhost_project %>'
infracloud-vanilla: infracloud-vanilla:
api_timeout: 60
auth: auth:
auth_url: https://controller00.vanilla.ic.openstack.org:5000 auth_url: https://controller00.vanilla.ic.openstack.org:5000
username: '<%= @infracloud_vanilla_username %>' username: '<%= @infracloud_vanilla_username %>'
@ -77,6 +84,7 @@ clouds:
floating_ip_source: None floating_ip_source: None
cacert: /home/nodepool/.config/openstack/infracloud_vanilla_cacert.pem cacert: /home/nodepool/.config/openstack/infracloud_vanilla_cacert.pem
infracloud-chocolate: infracloud-chocolate:
api_timeout: 60
auth: auth:
auth_url: https://controller00.chocolate.ic.openstack.org:5000 auth_url: https://controller00.chocolate.ic.openstack.org:5000
username: '<%= @infracloud_chocolate_username %>' username: '<%= @infracloud_chocolate_username %>'
@ -94,6 +102,7 @@ clouds:
- La1 - La1
- Sto2 - Sto2
profile: citycloud profile: citycloud
api_timeout: 60
auth: auth:
username: '<%= @citycloud_username %>' username: '<%= @citycloud_username %>'
password: '<%= @citycloud_password %>' password: '<%= @citycloud_password %>'