From 84dac6c5cc2ca368fe147a07d3ddfad42696df98 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Fri, 15 Apr 2016 08:08:31 -0500 Subject: [PATCH] Use floating_ip_source for tripleo cloud Instead of just turning off neutron, purely tell shade to use nova for floating ips. Change-Id: I731adfb1f5de788a3e2f5f66ab0be24c22a39b08 --- modules/openstack_project/templates/nodepool/clouds.yaml.erb | 2 +- .../templates/puppetmaster/all-clouds.yaml.erb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb index 52ebebeddb..dff2457c20 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -28,7 +28,7 @@ clouds: password: '<%= tripleo_password %>' project_name: '<%= tripleo_project %>' auth_url: 'https://ci-overcloud.rh1.tripleo.org:13000/v2.0' - has_network: False + floating_ip_source: nova bluebox-sjc1: auth: username: '<%= bluebox_username %>' diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 64fa70d829..049cf41d3a 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -103,6 +103,7 @@ clouds: username: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_username'] %> password: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_password'] %> project_name: <%= @puppetmaster_clouds['openstack_nodepool_tripleo_project_name'] %> + floating_ip_source: nova openstackjenkins-osic-cloud1: region_name: RegionOne auth: