openstack/devstack
Code Issues Proposed changes

Remove default quantum-keystoneclient dep.

Browse Source 
* Don't automatically install q-cli with horizon
 * Always install q-cli if ENABLED_SERVICES includes 'quantum'
 * Completely remove quantum config from horizon (there is no quantum+horizon in essex)

Change-Id: I0897437326abd757b6c792fd6ec946fa6e7981c9
This commit is contained in:
Anthony Young 2012-03-15 11:27:13 -07:00
parent e347b990ce
commit 84a03e0d83
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
stack.sh
View File

@ -651,7 +651,7 @@ if is_service_enabled q-svc; then
# quantum
git_clone $QUANTUM_REPO $QUANTUM_DIR $QUANTUM_BRANCH
fi
if is_service_enabled q-svc horizon; then
if is_service_enabled quantum; then
git_clone $QUANTUM_CLIENT_REPO $QUANTUM_CLIENT_DIR $QUANTUM_CLIENT_BRANCH
fi
@ -688,7 +688,7 @@ fi
if is_service_enabled q-svc; then
cd $QUANTUM_DIR; sudo python setup.py develop
fi
if is_service_enabled q-svc horizon; then
if is_service_enabled quantum; then
cd $QUANTUM_CLIENT_DIR; sudo python setup.py develop
fi
if is_service_enabled m-svc; then
@ -784,9 +784,6 @@ if is_service_enabled horizon; then
# Install apache2, which is NOPRIME'd
apt_get install apache2 libapache2-mod-wsgi
# Link to quantum client directory.
rm -fr ${HORIZON_DIR}/openstack_dashboard/quantum
ln -s ${QUANTUM_CLIENT_DIR}/quantum ${HORIZON_DIR}/openstack_dashboard/quantum
# Remove stale session database.
rm -f $HORIZON_DIR/openstack_dashboard/local/dashboard_openstack.sqlite3
@ -795,11 +792,6 @@ if is_service_enabled horizon; then
local_settings=$HORIZON_DIR/openstack_dashboard/local/local_settings.py
cp $FILES/horizon_settings.py $local_settings
# Enable quantum in dashboard, if requested
if is_service_enabled quantum; then
sudo sed -e "s,QUANTUM_ENABLED = False,QUANTUM_ENABLED = True,g" -i $local_settings
fi
# Initialize the horizon database (it stores sessions and notices shown to
# users). The user system is external (keystone).
cd $HORIZON_DIR