opendev/system-config
Code Issues Proposed changes

Merge "Use floating_ip_source for tripleo cloud"

Browse Source
This commit is contained in:
Jenkins 2016-04-15 18:52:45 +00:00 committed by Gerrit Code Review
commit 1cd1ce60e4
2 changed files with 2 additions and 1 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

@ -28,7 +28,7 @@ clouds:
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'
has_network: False floating_ip_source: nova
bluebox-sjc1: bluebox-sjc1:
auth: auth:
username: '<%= bluebox_username %>' username: '<%= bluebox_username %>'

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

@ -103,6 +103,7 @@ clouds:
username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %> username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %>
password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %> password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %>
project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %> project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %>
floating_ip_source: nova
openstackjenkins-osic-cloud1: openstackjenkins-osic-cloud1:
region_name: RegionOne region_name: RegionOne
auth: auth: