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/ironic b/lib/ironic
index c90482a..afe69f2 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -28,7 +28,7 @@
# --------
# Set up default directories
-GITDIR["ironicclient"]=$DEST/python-ironicclient
+GITDIR["python-ironicclient"]=$DEST/python-ironicclient
IRONIC_DIR=$DEST/ironic
IRONIC_PYTHON_AGENT_DIR=$DEST/ironic-python-agent
@@ -151,10 +151,10 @@
# install_ironicclient() - Collect sources and prepare
function install_ironicclient {
- if use_library_from_git "ironicclient"; then
- git_clone_by_name "ironicclient"
- setup_develop "ironicclient"
- sudo install -D -m 0644 -o $STACK_USER {$IRONICCLIENT_DIR/tools/,/etc/bash_completion.d/}ironic.bash_completion
+ if use_library_from_git "python-ironicclient"; then
+ git_clone_by_name "python-ironicclient"
+ setup_dev_lib "python-ironicclient"
+ sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-ironicclient"]}/tools/,/etc/bash_completion.d/}ironic.bash_completion
else
# nothing actually "requires" ironicclient, so force instally from pypi
pip_install python-ironicclient