Browse code

make python-keystoneclient configurable via devstack, remove pip requirement for horizon.

* Update to use https://github.com/openstack/python-keystoneclient

Change-Id: I54c1ba7fe11de9a6a8f53bdfe8b1c0bd2f5b8f58

Anthony Young authored on 2011/12/28 15:22:14
Showing 3 changed files
... ...
@@ -1,6 +1,4 @@
1 1
 django-nose-selenium
2 2
 pycrypto==2.3
3 3
 
4
--e git+https://github.com/cloudbuilders/openstackx.git#egg=openstackx
5 4
 -e git+https://github.com/jacobian/openstack.compute.git#egg=openstack
6
--e git+https://review.openstack.org/p/openstack/python-keystoneclient#egg=python-keystoneclient
... ...
@@ -171,6 +171,7 @@ HORIZON_DIR=$DEST/horizon
171 171
 GLANCE_DIR=$DEST/glance
172 172
 KEYSTONE_DIR=$DEST/keystone
173 173
 NOVACLIENT_DIR=$DEST/python-novaclient
174
+KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
174 175
 OPENSTACKX_DIR=$DEST/openstackx
175 176
 NOVNC_DIR=$DEST/noVNC
176 177
 SWIFT_DIR=$DEST/swift
... ...
@@ -551,6 +552,7 @@ fi
551 551
 if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
552 552
     # django powered web control panel for openstack
553 553
     git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG
554
+    git_clone $KEYSTONECLIENT_REPO $KEYSTONECLIENT_DIR $KEYSTONECLIENT_BRANCH
554 555
 fi
555 556
 if [[ "$ENABLED_SERVICES" =~ "openstackx" ]]; then
556 557
     # openstackx is a collection of extensions to openstack.compute & nova
... ...
@@ -588,6 +590,7 @@ if [[ "$ENABLED_SERVICES" =~ "openstackx" ]]; then
588 588
     cd $OPENSTACKX_DIR; sudo python setup.py develop
589 589
 fi
590 590
 if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
591
+    cd $KEYSTONECLIENT_DIR; sudo python setup.py develop
591 592
     cd $HORIZON_DIR/horizon; sudo python setup.py develop
592 593
     cd $HORIZON_DIR/openstack-dashboard; sudo python setup.py develop
593 594
 fi
... ...
@@ -30,6 +30,10 @@ HORIZON_BRANCH=master
30 30
 NOVACLIENT_REPO=https://github.com/openstack/python-novaclient.git
31 31
 NOVACLIENT_BRANCH=master
32 32
 
33
+# python keystone client library to nova that horizon uses
34
+KEYSTONECLIENT_REPO=https://github.com/openstack/python-keystoneclient
35
+KEYSTONECLIENT_BRANCH=master
36
+
33 37
 # openstackx is a collection of extensions to openstack.compute & nova
34 38
 # that is *deprecated*.  The code is being moved into python-novaclient & nova.
35 39
 OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git