opendev/system-config
Code Issues Proposed changes

Merge "Add chocolate openstackci oscc to Puppetmaster all-clouds"

Browse Source
This commit is contained in:
Jenkins 2016-09-28 11:47:25 +00:00 committed by Gerrit Code Review
commit bdb0e8d22e
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,18 @@ 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-infracloud-chocolate:
region_name: RegionOne
auth:
auth_url: https://controller00.chocolate.ic.openstack.org:5000
username: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_username'] %>
password: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_password'] %>
project_name: <%= @puppetmaster_clouds['openstackci_infracloud_chocolate_project_name'] %>
project_domain_name: default
user_domain_name: default
identity_api_version: '3'
floating_ip_source: None
cacert: /etc/ssl/certs/ca-certificates.crt
openstackci-internap: openstackci-internap:
profile: internap profile: internap
auth: auth: