opendev/system-config
Code Issues Proposed changes

Normalize list indentation in clouds.yaml

Browse Source 
Yes, they both work, but generally we use this form.

Change-Id: I7d04194cacc9fcaeab9176c761de4b2730ac4667
This commit is contained in:
James E. Blair 2016-04-15 10:30:22 -07:00
parent 16c9274213
commit 542999b05e
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,10 +43,10 @@ clouds:
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
- name: inap-17304-LAN3326 - name: inap-17304-LAN3326
routes_externally: False routes_externally: False
osic-cloud1: osic-cloud1:
region_name: RegionOne region_name: RegionOne
auth: auth:

36
modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
View File

@ -35,10 +35,10 @@ clouds:
password: <%= @puppetmaster_clouds['openstackci_internap_password'] %> password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
networks: networks:
- name: inap-17301-WAN2344 - name: inap-17301-WAN2344
routes_externally: True routes_externally: True
- name: inap-17301-LAN3328 - name: inap-17301-LAN3328
routes_externally: False routes_externally: False
openstackjenkins-internap: openstackjenkins-internap:
region_name: nyj01 region_name: nyj01
profile: internap profile: internap
@ -48,9 +48,9 @@ clouds:
project_name: <%= @puppetmaster_clouds['openstackjenkins_internap_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackjenkins_internap_project_name'] %>
openstackci-ovh: openstackci-ovh:
regions: regions:
- GRA1 - GRA1
- SBG1 - SBG1
- BHS1 - BHS1
profile: ovh profile: ovh
auth: auth:
username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %> username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %>
@ -58,9 +58,9 @@ clouds:
project_name: <%= @puppetmaster_clouds['openstackci_ovh_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_ovh_project_name'] %>
openstackci-rax: openstackci-rax:
regions: regions:
- DFW - DFW
- ORD - ORD
- IAD - IAD
profile: rackspace profile: rackspace
auth: auth:
username: <%= @puppetmaster_clouds['openstackci_rax_username'] %> username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>
@ -75,9 +75,9 @@ clouds:
project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackjenkins_bluebox_project_name'] %>
openstackjenkins-rax: openstackjenkins-rax:
regions: regions:
- DFW - DFW
- ORD - ORD
- IAD - IAD
profile: rackspace profile: rackspace
auth: auth:
username: <%= @puppetmaster_clouds['openstackjenkins_rax_username'] %> username: <%= @puppetmaster_clouds['openstackjenkins_rax_username'] %>
@ -85,8 +85,8 @@ clouds:
project_id: <%= @puppetmaster_clouds['openstackjenkins_rax_project_id'] %> project_id: <%= @puppetmaster_clouds['openstackjenkins_rax_project_id'] %>
openstackjenkins-ovh: openstackjenkins-ovh:
regions: regions:
- GRA1 - GRA1
- SBG1 - SBG1
profile: ovh profile: ovh
auth: auth:
username: <%= @puppetmaster_clouds['openstackjenkins_ovh_username'] %> username: <%= @puppetmaster_clouds['openstackjenkins_ovh_username'] %>
@ -94,9 +94,9 @@ clouds:
project_name: <%= @puppetmaster_clouds['openstackjenkins_ovh_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackjenkins_ovh_project_name'] %>
openstack-rax: openstack-rax:
regions: regions:
- DFW - DFW
- ORD - ORD
- IAD - IAD
profile: rackspace profile: rackspace
auth: auth:
username: <%= @puppetmaster_clouds['openstack_rax_username'] %> username: <%= @puppetmaster_clouds['openstack_rax_username'] %>

20
modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
View File

@ -19,15 +19,15 @@ clouds:
password: <%= @puppetmaster_clouds['openstackci_internap_password'] %> password: <%= @puppetmaster_clouds['openstackci_internap_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_internap_project_name'] %>
networks: networks:
- name: inap-17301-WAN2344 - name: inap-17301-WAN2344
routes_externally: True routes_externally: True
- name: inap-17301-LAN3328 - name: inap-17301-LAN3328
routes_externally: False routes_externally: False
openstackci-ovh: openstackci-ovh:
regions: regions:
- GRA1 - GRA1
- SBG1 - SBG1
- BHS1 - BHS1
profile: ovh profile: ovh
auth: auth:
username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %> username: <%= @puppetmaster_clouds['openstackci_ovh_username'] %>
@ -35,9 +35,9 @@ clouds:
project_name: <%= @puppetmaster_clouds['openstackci_ovh_project_name'] %> project_name: <%= @puppetmaster_clouds['openstackci_ovh_project_name'] %>
openstackci-rax: openstackci-rax:
regions: regions:
- DFW - DFW
- ORD - ORD
- IAD - IAD
profile: rackspace profile: rackspace
auth: auth:
username: <%= @puppetmaster_clouds['openstackci_rax_username'] %> username: <%= @puppetmaster_clouds['openstackci_rax_username'] %>