Move setup_develop call
Move setup_develop() call into the install_XXX() function as the
distinction has no real purpose. This eliminates the configure_XXXclient()
function for Nova and Swift.
Also create install_cinderclient() as we will need it to handle dependencies
in a followup patch.
Chasing down another #$^%&&^^^$%%#$ prettytable version pin
Change-Id: I61d761bc57a31caf2ed0ade326ab236eb2bb7358
diff --git a/stack.sh b/stack.sh
index e665450..1010b4e 100755
--- a/stack.sh
+++ b/stack.sh
@@ -564,9 +564,11 @@
# Grab clients first
install_keystoneclient
install_glanceclient
+install_cinderclient
install_novaclient
# Check out the client libs that are used most
git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH
+setup_develop $OPENSTACKCLIENT_DIR
# glance, swift middleware and nova api needs keystone middleware
if is_service_enabled key g-api n-api s-proxy; then
@@ -627,8 +629,6 @@
echo_summary "Configuring OpenStack projects"
# Set up our checkouts so they are installed in the python path
-configure_novaclient
-setup_develop $OPENSTACKCLIENT_DIR
if is_service_enabled key g-api n-api s-proxy; then
configure_keystone
@@ -636,7 +636,6 @@
if is_service_enabled s-proxy; then
configure_swift
- configure_swiftclient
if is_service_enabled swift3; then
setup_develop $SWIFT3_DIR
fi