openstack/trove
Code Issues Proposed changes

Remove LIBS_FROM_GIT_*

Browse Source 
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
This commit is contained in:
Andreas Jaeger 2017-03-27 08:28:36 +02:00
parent c84f5cce14
commit 03091f1c58
2 changed files with 6 additions and 40 deletions
integration/scripts
localrc.rctrovestack.rc

42
integration/scripts/localrc.rc

@ -41,44 +41,14 @@ fi
# Use Git repositories for client components # Use Git repositories for client components
LIBS_FROM_GIT=python-troveclient LIBS_FROM_GIT=python-troveclient
if [[ $LIBS_FROM_GIT_ALL_CLIENTS = true ]]; then if [[ $ENABLE_NEUTRON = 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
LIBS_FROM_GIT+=,python-neutronclient 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 fi
# Add Git repositories for libraries if [[ $ENABLE_MISTRAL = true ]]; then
if [[ $LIBS_FROM_GIT_ALL_OSLO = true ]]; then LIBS_FROM_GIT+=,python-mistralclient
LIBS_FROM_GIT+=,cliff,futurist fi
LIBS_FROM_GIT+=,debtcollector,automaton if [[ $ENABLE_CEILOMETER = true ]]; then
LIBS_FROM_GIT+=,oslo.cache,oslo.concurrency LIBS_FROM_GIT+=,python-ceilometerclient
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
fi fi
NOVNC_FROM_PACKAGE=false NOVNC_FROM_PACKAGE=false

4
integration/scripts/trovestack.rc

@ -24,10 +24,6 @@ ENABLE_CEILOMETER=$(get_bool ENABLE_CEILOMETER $ENABLE_PROFILER)
# Enable Mistral # Enable Mistral
ENABLE_MISTRAL=$(get_bool ENABLE_MISTRAL false) 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 # Don't include certain .rc files in local.conf.d by default
USING_VAGRANT=$(get_bool USING_VAGRANT false) USING_VAGRANT=$(get_bool USING_VAGRANT false)
USE_KVM=$(get_bool USE_KVM false) USE_KVM=$(get_bool USE_KVM false)