Let's see whether openstackclient will trigger unneeded version bump for
clients if its installation is put below all other services that are
expected to intall client libraries on proper versions on their own.
Change-Id: Ifa774219b7057112fc794a5e3d93bc963c55ba90
... | ... |
@@ -734,14 +734,6 @@ fi |
734 | 734 |
# Install middleware |
735 | 735 |
install_keystonemiddleware |
736 | 736 |
|
737 |
-# install the OpenStack client, needed for most setup commands |
|
738 |
-if use_library_from_git "python-openstackclient"; then |
|
739 |
- git_clone_by_name "python-openstackclient" |
|
740 |
- setup_dev_lib "python-openstackclient" |
|
741 |
-else |
|
742 |
- pip_install 'python-openstackclient>=1.0.2' |
|
743 |
-fi |
|
744 |
- |
|
745 | 737 |
|
746 | 738 |
if is_service_enabled keystone; then |
747 | 739 |
if [ "$KEYSTONE_AUTH_HOST" == "$SERVICE_HOST" ]; then |
... | ... |
@@ -816,13 +808,22 @@ if is_service_enabled tls-proxy || [ "$USE_SSL" == "True" ]; then |
816 | 816 |
# don't be naive and add to existing line! |
817 | 817 |
fi |
818 | 818 |
|
819 |
- |
|
820 | 819 |
# Extras Install |
821 | 820 |
# -------------- |
822 | 821 |
|
823 | 822 |
# Phase: install |
824 | 823 |
run_phase stack install |
825 | 824 |
|
825 |
+ |
|
826 |
+# install the OpenStack client, needed for most setup commands |
|
827 |
+if use_library_from_git "python-openstackclient"; then |
|
828 |
+ git_clone_by_name "python-openstackclient" |
|
829 |
+ setup_dev_lib "python-openstackclient" |
|
830 |
+else |
|
831 |
+ pip_install 'python-openstackclient>=1.0.2' |
|
832 |
+fi |
|
833 |
+ |
|
834 |
+ |
|
826 | 835 |
if [[ $TRACK_DEPENDS = True ]]; then |
827 | 836 |
$DEST/.venv/bin/pip freeze > $DEST/requires-post-pip |
828 | 837 |
if ! diff -Nru $DEST/requires-pre-pip $DEST/requires-post-pip > $DEST/requires.diff; then |