opendev/system-config
Code Issues Proposed changes

Merge "Use project_name not _id with OSIC"

Browse Source
This commit is contained in:
Jenkins 2016-03-02 05:41:35 +00:00 committed by Gerrit Code Review
commit b557e1d179
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ clouds:
auth_url: https://172.99.101.17:5000 auth_url: https://172.99.101.17:5000
username: <%= osic_username %> username: <%= osic_username %>
password: <%= osic_password %> password: <%= osic_password %>
project_id: <%= 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'

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

@ -118,7 +118,7 @@ clouds:
auth_url: https://172.99.101.17:5000 auth_url: https://172.99.101.17:5000
username: <%= @puppetmaster_clouds['openstackjenkins_osic_username'] %> username: <%= @puppetmaster_clouds['openstackjenkins_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackjenkins_osic_password'] %> password: <%= @puppetmaster_clouds['openstackjenkins_osic_password'] %>
project_id: <%= @puppetmaster_clouds['openstackjenkins_osic_project_id'] %> project_name: <%= @puppetmaster_clouds['openstackjenkins_osic_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'
@ -131,7 +131,7 @@ clouds:
auth_url: https://172.99.101.17:5000 auth_url: https://172.99.101.17:5000
username: <%= @puppetmaster_clouds['openstackci_osic_username'] %> username: <%= @puppetmaster_clouds['openstackci_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_password'] %> password: <%= @puppetmaster_clouds['openstackci_osic_password'] %>
project_id: <%= @puppetmaster_clouds['openstackci_osic_project_id'] %> project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'

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

@ -44,7 +44,7 @@ clouds:
auth_url: https://172.99.101.17:5000 auth_url: https://172.99.101.17:5000
username: <%= @puppetmaster_clouds['openstackci_osic_username'] %> username: <%= @puppetmaster_clouds['openstackci_osic_username'] %>
password: <%= @puppetmaster_clouds['openstackci_osic_password'] %> password: <%= @puppetmaster_clouds['openstackci_osic_password'] %>
project_id: <%= @puppetmaster_clouds['openstackci_osic_project_id'] %> project_name: <%= @puppetmaster_clouds['openstackci_osic_project_name'] %>
project_domain_name: default project_domain_name: default
user_domain_name: default user_domain_name: default
identity_api_version: '3' identity_api_version: '3'