opendev/system-config
Code Issues Proposed changes

Merge "Fix deprecated warnings on clouds.yaml.erb"

Browse Source
This commit is contained in:
Jenkins 2016-07-19 00:08:41 +00:00 committed by Gerrit Code Review
commit 8ca94351b7
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,23 +10,23 @@ clouds:
- ORD - ORD
- IAD - IAD
auth: auth:
username: '<%= rackspace_username %>' username: '<%= @rackspace_username %>'
password: '<%= rackspace_password %>' password: '<%= @rackspace_password %>'
project_id: <%= rackspace_project %> project_id: <%= @rackspace_project %>
ovh: ovh:
profile: ovh profile: ovh
regions: regions:
- BHS1 - BHS1
- GRA1 - GRA1
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
auth: auth:
username: '<%= tripleo_username %>' username: '<%= @tripleo_username %>'
password: '<%= tripleo_password %>' password: '<%= @tripleo_password %>'
project_name: '<%= tripleo_project %>' project_name: '<%= tripleo_project %>'
auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000/v2.0' auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000/v2.0'
floating_ip_source: nova floating_ip_source: nova
@ -40,17 +40,17 @@ clouds:
floating_ip_source: neutron floating_ip_source: neutron
bluebox-sjc1: bluebox-sjc1:
auth: auth:
username: '<%= bluebox_username %>' username: '<%= @bluebox_username %>'
password: '<%= bluebox_password %>' password: '<%= @bluebox_password %>'
project_name: '<%= bluebox_project %>' project_name: '<%= @bluebox_project %>'
auth_url: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0' auth_url: 'https://montytaylor-sjc.openstack.blueboxgrid.com:5001/v2.0'
internap: internap:
profile: internap profile: internap
region_name: nyj01 region_name: nyj01
auth: auth:
username: '<%= internap_username %>' username: '<%= @internap_username %>'
password: '<%= internap_password %>' password: '<%= @internap_password %>'
project_name: '<%= internap_project %>' project_name: '<%= @internap_project %>'
networks: networks:
- name: inap-17304-WAN2342 - name: inap-17304-WAN2342
routes_externally: True routes_externally: True
@ -60,9 +60,9 @@ clouds:
region_name: RegionOne region_name: RegionOne
auth: auth:
auth_url: https://cloud1.osic.org:5000 auth_url: https://cloud1.osic.org:5000
username: <%= osic_username %> username: <%= @osic_username %>
password: <%= osic_password %> password: <%= @osic_password %>
project_name: <%= osic_project %> project_name: <%= @osic_project %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
@ -70,6 +70,6 @@ clouds:
region_name: ca-ymq-1 region_name: ca-ymq-1
profile: vexxhost profile: vexxhost
auth: auth:
username: '<%= vexxhost_username %>' username: '<%= @vexxhost_username %>'
password: '<%= vexxhost_password %>' password: '<%= @vexxhost_password %>'
project_name: '<%= vexxhost_project %>' project_name: '<%= @vexxhost_project %>'