From a21afdb0b0d35e4e1c216ae2cfeca9e93f1f12e5 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Mon, 12 Sep 2016 10:52:59 -0400 Subject: [PATCH] Set floating_ip_source: None for infracloud-vanilla We don't need shade to run NeutronFloatingIPList. Change-Id: I2171904c4720607c8181c0a149370c6d6cf957ed Signed-off-by: Paul Belanger --- 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 837bc584ac..ac21040d9f 100644 --- a/modules/openstack_project/templates/nodepool/clouds.yaml.erb +++ b/modules/openstack_project/templates/nodepool/clouds.yaml.erb @@ -122,4 +122,5 @@ clouds: project_domain_name: default user_domain_name: default identity_api_version: '3' + floating_ip_source: None cacert: /home/nodepool/.config/openstack/infracloud_vanilla_cacert.pem diff --git a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb index 188e55664b..ce8f529b5d 100644 --- a/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/all-clouds.yaml.erb @@ -54,6 +54,7 @@ clouds: 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: profile: internap @@ -133,6 +134,7 @@ clouds: project_domain_name: default user_domain_name: default identity_api_version: '3' + floating_ip_source: None cacert: /etc/ssl/certs/ca-certificates.crt openstackjenkins-rax: regions: diff --git a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb index 74efb836e9..27dfb728ea 100644 --- a/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb +++ b/modules/openstack_project/templates/puppetmaster/ansible-clouds.yaml.erb @@ -123,4 +123,5 @@ clouds: project_domain_name: default user_domain_name: default identity_api_version: '3' + floating_ip_source: None cacert: /etc/ssl/certs/ca-certificates.crt