commit 52e631d8aace4bc50dba5f9d84dd4b0c1e2cbc44
author Anthony Young <sleepsonthefloor@gmail.com> Tue Dec 27 22:22:14 2011 -0800
committer Anthony Young <sleepsonthefloor@gmail.com> Wed Dec 28 15:55:34 2011 -0800
tree b369348221a477d66fb605d9e1c941e5fb8079b0
parent c1b2354a88f9d14c6773fe9f9fa06f918e37d8f8

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

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

Change-Id: I54c1ba7fe11de9a6a8f53bdfe8b1c0bd2f5b8f58

files/pips/horizon

diff --git a/files/pips/horizon b/files/pips/horizon
index 62575b8..893efb7 100644
--- a/files/pips/horizon
+++ b/files/pips/horizon
@@ -1,6 +1,4 @@
 django-nose-selenium
 pycrypto==2.3
 
--e git+https://github.com/cloudbuilders/openstackx.git#egg=openstackx
 -e git+https://github.com/jacobian/openstack.compute.git#egg=openstack
--e git+https://review.openstack.org/p/openstack/python-keystoneclient#egg=python-keystoneclient

stack.sh

diff --git a/stack.sh b/stack.sh
index 5c97814..19543ca 100755
--- a/stack.sh
+++ b/stack.sh
@@ -171,6 +171,7 @@
 GLANCE_DIR=$DEST/glance
 KEYSTONE_DIR=$DEST/keystone
 NOVACLIENT_DIR=$DEST/python-novaclient
+KEYSTONECLIENT_DIR=$DEST/python-keystoneclient
 OPENSTACKX_DIR=$DEST/openstackx
 NOVNC_DIR=$DEST/noVNC
 SWIFT_DIR=$DEST/swift
@@ -551,6 +552,7 @@
 if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
     # django powered web control panel for openstack
     git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH $HORIZON_TAG
+    git_clone $KEYSTONECLIENT_REPO $KEYSTONECLIENT_DIR $KEYSTONECLIENT_BRANCH
 fi
 if [[ "$ENABLED_SERVICES" =~ "openstackx" ]]; then
     # openstackx is a collection of extensions to openstack.compute & nova
@@ -588,6 +590,7 @@
     cd $OPENSTACKX_DIR; sudo python setup.py develop
 fi
 if [[ "$ENABLED_SERVICES" =~ "horizon" ]]; then
+    cd $KEYSTONECLIENT_DIR; sudo python setup.py develop
     cd $HORIZON_DIR/horizon; sudo python setup.py develop
     cd $HORIZON_DIR/openstack-dashboard; sudo python setup.py develop
 fi

stackrc

diff --git a/stackrc b/stackrc
index 0e700d5..2d5079f 100644
--- a/stackrc
+++ b/stackrc
@@ -30,6 +30,10 @@
 NOVACLIENT_REPO=https://github.com/openstack/python-novaclient.git
 NOVACLIENT_BRANCH=master
 
+# python keystone client library to nova that horizon uses
+KEYSTONECLIENT_REPO=https://github.com/openstack/python-keystoneclient
+KEYSTONECLIENT_BRANCH=master
+
 # openstackx is a collection of extensions to openstack.compute & nova
 # that is *deprecated*.  The code is being moved into python-novaclient & nova.
 OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git