Merge "Revert "Remove python-openstackclient.""
diff --git a/stack.sh b/stack.sh
index 9ecc749..570fc68 100755
--- a/stack.sh
+++ b/stack.sh
@@ -318,6 +318,7 @@
# Set the destination directories for OpenStack projects
HORIZON_DIR=$DEST/horizon
+OPENSTACKCLIENT_DIR=$DEST/python-openstackclient
NOVNC_DIR=$DEST/noVNC
SWIFT_DIR=$DEST/swift
SWIFT3_DIR=$DEST/swift3
@@ -794,6 +795,9 @@
install_glanceclient
install_novaclient
+# Check out the client libs that are used most
+git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH
+
# glance, swift middleware and nova api needs keystone middleware
if is_service_enabled key g-api n-api swift; then
# unified auth system (manages accounts/tokens)
@@ -859,6 +863,7 @@
# allowing ``import nova`` or ``import glance.client``
configure_keystoneclient
configure_novaclient
+setup_develop $OPENSTACKCLIENT_DIR
if is_service_enabled key g-api n-api swift; then
configure_keystone
fi
diff --git a/stackrc b/stackrc
index 9a244ed..9588cf9 100644
--- a/stackrc
+++ b/stackrc
@@ -76,6 +76,10 @@
NOVACLIENT_REPO=${GIT_BASE}/openstack/python-novaclient.git
NOVACLIENT_BRANCH=master
+# consolidated openstack python client
+OPENSTACKCLIENT_REPO=${GIT_BASE}/openstack/python-openstackclient.git
+OPENSTACKCLIENT_BRANCH=master
+
# python keystone client library to nova that horizon uses
KEYSTONECLIENT_REPO=${GIT_BASE}/openstack/python-keystoneclient
KEYSTONECLIENT_BRANCH=master