fix python-* lib from git installation
We're using all the magic variables based on python-fooclient, however
all the inline code was using fooclient for variables. So we had a
mismatch, which was kindly pointed out by some of the 3rd party ci
testers.
Change-Id: I27a56222c7e8e610fba8bf97672d2a42f5cf14ca
diff --git a/lib/cinder b/lib/cinder
index 5687864..eb3cbe8 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -36,7 +36,7 @@
fi
# set up default directories
-GITDIR["cinderclient"]=$DEST/python-cinderclient
+GITDIR["python-cinderclient"]=$DEST/python-cinderclient
CINDER_DIR=$DEST/cinder
CINDER_STATE_PATH=${CINDER_STATE_PATH:=$DATA_DIR/cinder}
@@ -403,10 +403,10 @@
# install_cinderclient() - Collect source and prepare
function install_cinderclient {
- if use_library_from_git "cinderclient"; then
- git_clone_by_name "cinderclient"
- setup_develop "cinderclient"
- sudo install -D -m 0644 -o $STACK_USER {$CINDERCLIENT_DIR/tools/,/etc/bash_completion.d/}cinder.bash_completion
+ if use_library_from_git "python-cinderclient"; then
+ git_clone_by_name "python-cinderclient"
+ setup_dev_lib "python-cinderclient"
+ sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-cinderclient"]}/tools/,/etc/bash_completion.d/}cinder.bash_completion
fi
}