opendev/system-config
Code Issues Proposed changes

Merge "Switch the floating ip source to neutron for rh1"

Browse Source
This commit is contained in:
Jenkins 2016-08-04 12:33:47 +00:00 committed by Gerrit Code Review
commit 910d299849
2 changed files with 2 additions and 2 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

@ -29,7 +29,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'
floating_ip_source: nova floating_ip_source: neutron
tripleo-test-cloud-rh2: tripleo-test-cloud-rh2:
region_name: regionOne region_name: regionOne
auth: auth:

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

@ -109,7 +109,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 floating_ip_source: neutron
openstackjenkins-osic-cloud1: openstackjenkins-osic-cloud1:
region_name: RegionOne region_name: RegionOne
auth: auth: