From 360839e0addbd2692ee34333ac06d957cf60b780 Mon Sep 17 00:00:00 2001
From: Ken Chen <ken.chen@intel.com>
Date: Fri, 27 Feb 2015 14:12:23 +0800
Subject: [PATCH] Remove setting use_floating_ips values

We remove the code to set use_floating_ips. In old code it was set
false if we do not use neutron. However, we cannot deploy clusters
with floating ips by that. So we just use the default value, which
is set True in Sahara.

Closes-Bug: #1426226
Change-Id: Idfcdc5ab776681ddc740dc12035e04da349ea089
---
 lib/sahara | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/sahara b/lib/sahara
index 9b2e9c406d..521b19a4a1 100644
--- a/lib/sahara
+++ b/lib/sahara
@@ -139,14 +139,12 @@ function configure_sahara {
 
     if is_service_enabled neutron; then
         iniset $SAHARA_CONF_FILE DEFAULT use_neutron true
-        iniset $SAHARA_CONF_FILE DEFAULT use_floating_ips true
 
         if is_ssl_enabled_service "neutron" || is_service_enabled tls-proxy; then
             iniset $SAHARA_CONF_FILE neutron ca_file $SSL_BUNDLE_FILE
         fi
     else
         iniset $SAHARA_CONF_FILE DEFAULT use_neutron false
-        iniset $SAHARA_CONF_FILE DEFAULT use_floating_ips false
     fi
 
     if is_service_enabled heat; then