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/lib/nova b/lib/nova
index 91fe028..8d045b5 100644
--- a/lib/nova
+++ b/lib/nova
@@ -169,11 +169,6 @@
sudo rm -rf $NOVA_STATE_PATH $NOVA_AUTH_CACHE_DIR
}
-# configure_novaclient() - Set config files, create data dirs, etc
-function configure_novaclient() {
- setup_develop $NOVACLIENT_DIR
-}
-
# configure_nova_rootwrap() - configure Nova's rootwrap
function configure_nova_rootwrap() {
# Deploy new rootwrap filters files (owned by root).
@@ -204,8 +199,6 @@
# configure_nova() - Set config files, create data dirs, etc
function configure_nova() {
- setup_develop $NOVA_DIR
-
# Put config files in ``/etc/nova`` for everyone to find
if [[ ! -d $NOVA_CONF_DIR ]]; then
sudo mkdir -p $NOVA_CONF_DIR
@@ -597,6 +590,7 @@
# install_novaclient() - Collect source and prepare
function install_novaclient() {
git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH
+ setup_develop $NOVACLIENT_DIR
}
# install_nova() - Collect source and prepare
@@ -627,6 +621,7 @@
fi
git_clone $NOVA_REPO $NOVA_DIR $NOVA_BRANCH
+ setup_develop $NOVA_DIR
}
# start_nova_api() - Start the API process ahead of other things