opendev/system-config
Code Issues Proposed changes

Merge "Update citycloud to non demo accounts"

Browse Source
This commit is contained in:
Jenkins 2017-05-10 15:27:07 +00:00 committed by Gerrit Code Review
commit 9fd5ee7784
3 changed files with 37 additions and 9 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

@ -147,16 +147,17 @@ clouds:
identity_api_version: '2' identity_api_version: '2'
citycloud: citycloud:
regions: regions:
- Fra1
- Lon1 - Lon1
- Kna1 - Kna1
- La1
- Sto2
profile: citycloud profile: citycloud
auth: auth:
username: '<%= @citycloud_username %>' username: '<%= @citycloud_username %>'
password: '<%= @citycloud_password %>' password: '<%= @citycloud_password %>'
project_id: 1e6292e5893043a9b75ba0066079642c project_id: 656841f5d46e4b0889129d1fc20bd0b8
project_domain_name: default project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
user_domain_id: c4a5013bd7e6427082ad11e5d260870d user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
entercloud: entercloud:
regions: regions:
- nl-ams1 - nl-ams1

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

@ -317,18 +317,32 @@ clouds:
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '2' identity_api_version: '2'
openstackzuul-citycloud: openstackci-citycloud:
regions: regions:
- Fra1
- Lon1 - Lon1
- Kna1 - Kna1
- La1
- Sto2
profile: citycloud
auth:
username: <%= @puppetmaster_clouds['openstackci_citycloud_username'] %>
password: <%= @puppetmaster_clouds['openstackci_citycloud_password'] %>
project_id: bed89257500340af8d0fbe7141b1bfd6
project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
openstackzuul-citycloud:
regions:
- Lon1
- Kna1
- La1
- Sto2
profile: citycloud profile: citycloud
auth: auth:
username: <%= @puppetmaster_clouds['openstackzuul_citycloud_username'] %> username: <%= @puppetmaster_clouds['openstackzuul_citycloud_username'] %>
password: <%= @puppetmaster_clouds['openstackzuul_citycloud_password'] %> password: <%= @puppetmaster_clouds['openstackzuul_citycloud_password'] %>
project_id: 1e6292e5893043a9b75ba0066079642c project_id: 656841f5d46e4b0889129d1fc20bd0b8
project_domain_name: default project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
user_domain_id: c4a5013bd7e6427082ad11e5d260870d user_domain_id: a5e7d1a8f25b42b081cf89d1130638da
openstackzuul-entercloud: openstackzuul-entercloud:
regions: regions:
- nl-ams1 - nl-ams1

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

@ -137,3 +137,16 @@ clouds:
identity_api_version: '3' identity_api_version: '3'
floating_ip_source: None floating_ip_source: None
cacert: /etc/ssl/certs/ca-certificates.crt cacert: /etc/ssl/certs/ca-certificates.crt
openstackci-citycloud:
regions:
- Lon1
- Kna1
- La1
- Sto2
profile: citycloud
auth:
username: <%= @puppetmaster_clouds['openstackci_citycloud_username'] %>
password: <%= @puppetmaster_clouds['openstackci_citycloud_password'] %>
project_id: bed89257500340af8d0fbe7141b1bfd6
project_domain_id: a5e7d1a8f25b42b081cf89d1130638da
user_domain_id: a5e7d1a8f25b42b081cf89d1130638da