This reverts commit 6e3330967c5c7be73a8ffee3779c214768683c56
This is in fact useful to an admittedly small population. And if I had not been on vacation I'd have -2'd it...
... | ... |
@@ -317,6 +317,7 @@ source $TOP_DIR/lib/tempest |
317 | 317 |
|
318 | 318 |
# Set the destination directories for OpenStack projects |
319 | 319 |
HORIZON_DIR=$DEST/horizon |
320 |
+OPENSTACKCLIENT_DIR=$DEST/python-openstackclient |
|
320 | 321 |
NOVNC_DIR=$DEST/noVNC |
321 | 322 |
SWIFT_DIR=$DEST/swift |
322 | 323 |
SWIFT3_DIR=$DEST/swift3 |
... | ... |
@@ -812,6 +813,9 @@ install_keystoneclient |
812 | 812 |
install_glanceclient |
813 | 813 |
install_novaclient |
814 | 814 |
|
815 |
+# Check out the client libs that are used most |
|
816 |
+git_clone $OPENSTACKCLIENT_REPO $OPENSTACKCLIENT_DIR $OPENSTACKCLIENT_BRANCH |
|
817 |
+ |
|
815 | 818 |
# glance, swift middleware and nova api needs keystone middleware |
816 | 819 |
if is_service_enabled key g-api n-api swift; then |
817 | 820 |
# unified auth system (manages accounts/tokens) |
... | ... |
@@ -877,6 +881,7 @@ echo_summary "Configuring OpenStack projects" |
877 | 877 |
# allowing ``import nova`` or ``import glance.client`` |
878 | 878 |
configure_keystoneclient |
879 | 879 |
configure_novaclient |
880 |
+setup_develop $OPENSTACKCLIENT_DIR |
|
880 | 881 |
if is_service_enabled key g-api n-api swift; then |
881 | 882 |
configure_keystone |
882 | 883 |
fi |
... | ... |
@@ -76,6 +76,10 @@ HORIZON_BRANCH=master |
76 | 76 |
NOVACLIENT_REPO=${GIT_BASE}/openstack/python-novaclient.git |
77 | 77 |
NOVACLIENT_BRANCH=master |
78 | 78 |
|
79 |
+# consolidated openstack python client |
|
80 |
+OPENSTACKCLIENT_REPO=${GIT_BASE}/openstack/python-openstackclient.git |
|
81 |
+OPENSTACKCLIENT_BRANCH=master |
|
82 |
+ |
|
79 | 83 |
# python keystone client library to nova that horizon uses |
80 | 84 |
KEYSTONECLIENT_REPO=${GIT_BASE}/openstack/python-keystoneclient |
81 | 85 |
KEYSTONECLIENT_BRANCH=master |