@@ -728,14 +728,6 @@ fi

 # Install middleware

 install_keystonemiddleware

-# install the OpenStack client, needed for most setup commands

-if use_library_from_git "python-openstackclient"; then

-    git_clone_by_name "python-openstackclient"

-    setup_dev_lib "python-openstackclient"

-else

-    pip_install 'python-openstackclient>=1.0.2'

-fi

-

 if is_service_enabled keystone; then

     if [ "$KEYSTONE_AUTH_HOST" == "$SERVICE_HOST" ]; then

@@ -810,13 +802,22 @@ if is_service_enabled tls-proxy || [ "$USE_SSL" == "True" ]; then

     # don't be naive and add to existing line!

 fi

-

 # Extras Install

 # --------------

 # Phase: install

 run_phase stack install

+

+# install the OpenStack client, needed for most setup commands

+if use_library_from_git "python-openstackclient"; then

+    git_clone_by_name "python-openstackclient"

+    setup_dev_lib "python-openstackclient"

+else

+    pip_install 'python-openstackclient>=1.0.2'

+fi

+

+

 if [[ $TRACK_DEPENDS = True ]]; then

     $DEST/.venv/bin/pip freeze > $DEST/requires-post-pip

     if ! diff -Nru $DEST/requires-pre-pip $DEST/requires-post-pip > $DEST/requires.diff; then