openstack/devstack
Code Issues Proposed changes

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

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

Change-Id: I54c1ba7fe11de9a6a8f53bdfe8b1c0bd2f5b8f58
This commit is contained in:
Anthony Young 2011-12-27 22:22:14 -08:00
parent c1b2354a88
commit 52e631d8aa
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/pips/horizon
View File

@ -1,6 +1,4 @@
django-nose-selenium django-nose-selenium
pycrypto==2.3 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://github.com/jacobian/openstack.compute.git#egg=openstack
-e git+https://review.openstack.org/p/openstack/python-keystoneclient#egg=python-keystoneclient

3
stack.sh
View File

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

4
stackrc
View File

@ -30,6 +30,10 @@ HORIZON_BRANCH=master
NOVACLIENT_REPO=https://github.com/openstack/python-novaclient.git NOVACLIENT_REPO=https://github.com/openstack/python-novaclient.git
NOVACLIENT_BRANCH=master 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 # openstackx is a collection of extensions to openstack.compute & nova
# that is *deprecated*. The code is being moved into python-novaclient & nova. # that is *deprecated*. The code is being moved into python-novaclient & nova.
OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git