From af2f1fb25468392a9e051762345607111968bc37 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 13 Aug 2016 11:41:32 -0500
Subject: [PATCH] Tell shade that OSIC doesn't need floating ips

shade will figure this out and do the right thing, but it'll be at the
expense of a bunch more API calls. We konw we don't need them, so short
circuit the detection.

Change-Id: Id893bfec1c5c0abcc5b448899e04de20f7f41363
---
 modules/openstack_project/templates/nodepool/clouds.yaml.erb    | 1 +
 .../templates/puppetmaster/all-clouds.yaml.erb                  | 2 ++
 .../templates/puppetmaster/ansible-clouds.yaml.erb              | 1 +
 3 files changed, 4 insertions(+)

diff --git a/modules/openstack_project/templates/nodepool/clouds.yaml.erb b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
index 3b14b42c17..1f9d7c9c76 100644
--- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb
+++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb
@@ -72,6 +72,7 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
+    floating_ip_source: None
   vexxhost:
     region_name: ca-ymq-1
     profile: vexxhost
diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
index 65c4140b5c..fa37aa15c1 100644
--- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb
@@ -141,6 +141,7 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
+    floating_ip_source: None
   openstackci-osic-cloud1:
     region_name: RegionOne
     auth:
@@ -151,6 +152,7 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
+    floating_ip_source: None
   openstackjenkins-vexxhost:
     region_name: ca-ymq-1
     profile: vexxhost
diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
index 87640baa51..52800d0704 100644
--- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
+++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb
@@ -48,6 +48,7 @@ clouds:
       project_domain_name: default
       user_domain_name: default
     identity_api_version: '3'
+    floating_ip_source: None
   openstackci-vexxhost:
     region_name: ca-ymq-1
     profile: vexxhost