@@ -690,24 +690,6 @@ if is_service_enabled heat horizon; then

     install_heatclient

 fi

-# 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

-    # FIXME(adam)g: Work around a gate wedge by installing a capped novaclient

-    # here, so that the following OSC installation does not pull in a newer one

-    # via its uncapped requirement.  This can be removed once OSC ends up in a

-    # venv.

-    pip_install "python-novaclient>=2.17.0,<2.21"

-

-    # Also install the capped neutronclient as per blocked

-    # https://review.openstack.org/#/c/157606/

-    pip_install "python-neutronclient>=2.3.4,<2.3.11"

-

-    pip_install "python-openstackclient<=1.0.1"

-fi

-

 if is_service_enabled key; then

     install_keystone

     configure_keystone

@@ -778,7 +760,6 @@ if is_service_enabled tls-proxy; then

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

 fi

-

 # Extras Install

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

@@ -789,6 +770,24 @@ if [[ -d $TOP_DIR/extras.d ]]; then

     done

 fi

+# 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

+    # FIXME(adam)g: Work around a gate wedge by installing a capped novaclient

+    # here, so that the following OSC installation does not pull in a newer one

+    # via its uncapped requirement.  This can be removed once OSC ends up in a

+    # venv.

+    pip_install "python-novaclient>=2.17.0,<2.21"

+

+    # Also install the capped neutronclient as per blocked

+    # https://review.openstack.org/#/c/157606/

+    pip_install "python-neutronclient>=2.3.4,<2.3.11"

+

+    pip_install "python-openstackclient<=1.0.1"

+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