From 03091f1c58908f48ad3baee8e34ccff66eb293ba Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Mon, 27 Mar 2017 08:28:36 +0200
Subject: [PATCH] Remove LIBS_FROM_GIT_*

LIBS_FROM_GIT_ALL_CLIENTS and LIBS_FROM_GIT_ALL_OSLO are not set
anywhere, remove them.

See:
http://codesearch.openstack.org/?q=LIBS_FROM_GIT_ALL_CLIENTS&i=nope&files=&repos=
http://codesearch.openstack.org/?q=LIBS_FROM_GIT_ALL_OSLO&i=nope&files=&repos=

Change-Id: I943fc4d026772f570fd30641201284fb9aae4a5f
---
 integration/scripts/localrc.rc    | 42 +++++--------------------------
 integration/scripts/trovestack.rc |  4 ---
 2 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/integration/scripts/localrc.rc b/integration/scripts/localrc.rc
index d3914b4bbf..8214cc781d 100644
--- a/integration/scripts/localrc.rc
+++ b/integration/scripts/localrc.rc
@@ -41,44 +41,14 @@ fi
 
 # Use Git repositories for client components
 LIBS_FROM_GIT=python-troveclient
-if [[ $LIBS_FROM_GIT_ALL_CLIENTS = true ]]; then
-    LIBS_FROM_GIT+=,python-ceilometerclient
-    LIBS_FROM_GIT+=,python-cinderclient
-    LIBS_FROM_GIT+=,python-glanceclient
-    LIBS_FROM_GIT+=,python-heatclient
-    LIBS_FROM_GIT+=,python-keystoneclient
-    LIBS_FROM_GIT+=,python-mistralclient
+if [[ $ENABLE_NEUTRON = true ]]; then
     LIBS_FROM_GIT+=,python-neutronclient
-    LIBS_FROM_GIT+=,python-novaclient
-    LIBS_FROM_GIT+=,python-openstackclient
-    LIBS_FROM_GIT+=,python-swiftclient
-else
-    if [[ $ENABLE_NEUTRON = true ]]; then
-        LIBS_FROM_GIT+=,python-neutronclient
-    fi
-    if [[ $ENABLE_MISTRAL = true ]]; then
-        LIBS_FROM_GIT+=,python-mistralclient
-    fi
-    if [[ $ENABLE_CEILOMETER = true ]]; then
-        LIBS_FROM_GIT+=,python-ceilometerclient
-    fi
 fi
-# Add Git repositories for libraries
-if [[ $LIBS_FROM_GIT_ALL_OSLO = true ]]; then
-    LIBS_FROM_GIT+=,cliff,futurist
-    LIBS_FROM_GIT+=,debtcollector,automaton
-    LIBS_FROM_GIT+=,oslo.cache,oslo.concurrency
-    LIBS_FROM_GIT+=,oslo.config,oslo.context
-    LIBS_FROM_GIT+=,oslo.db,oslo.i18n
-    LIBS_FROM_GIT+=,oslo.log,oslo.messaging
-    LIBS_FROM_GIT+=,oslo.middleware,oslo.policy
-    LIBS_FROM_GIT+=,oslo.reports,oslo.rootwrap
-    LIBS_FROM_GIT+=,oslo.serialization,oslo.service
-    LIBS_FROM_GIT+=,oslo.utils,oslo.versionedobjects
-    LIBS_FROM_GIT+=,oslo.vmware
-    LIBS_FROM_GIT+=,pycadf,stevedore
-    LIBS_FROM_GIT+=,taskflow,tooz
-    LIBS_FROM_GIT+=,pbr
+if [[ $ENABLE_MISTRAL = true ]]; then
+    LIBS_FROM_GIT+=,python-mistralclient
+fi
+if [[ $ENABLE_CEILOMETER = true ]]; then
+    LIBS_FROM_GIT+=,python-ceilometerclient
 fi
 
 NOVNC_FROM_PACKAGE=false
diff --git a/integration/scripts/trovestack.rc b/integration/scripts/trovestack.rc
index 546468863f..a32aed5435 100644
--- a/integration/scripts/trovestack.rc
+++ b/integration/scripts/trovestack.rc
@@ -24,10 +24,6 @@ ENABLE_CEILOMETER=$(get_bool ENABLE_CEILOMETER $ENABLE_PROFILER)
 # Enable Mistral
 ENABLE_MISTRAL=$(get_bool ENABLE_MISTRAL false)
 
-# Enable LIBS_FROM_GIT
-LIBS_FROM_GIT_ALL_CLIENTS=$(get_bool LIBS_FROM_GIT_ALL_CLIENTS false)
-LIBS_FROM_GIT_ALL_OSLO=$(get_bool LIBS_FROM_GIT_ALL_OSLO false)
-
 # Don't include certain .rc files in local.conf.d by default
 USING_VAGRANT=$(get_bool USING_VAGRANT false)
 USE_KVM=$(get_bool USE_KVM false)