openstack/devstack
Code Issues Proposed changes

Move ENABLED_SERVICES to stackrc.

Browse Source 
allow us to do things like that :

ENABLED_SERVICES="$ENABLED_SERVICES,swift"

in localrc instead of having to copy the full config from stack.sh.

Fixes bug 951598.

Change-Id: I17e168473540760bcfa40a752ff2c266bd9b7044
This commit is contained in:
Chmouel Boudjnah 2012-03-09 14:21:40 +00:00
parent d9f0e91f17
commit 8da5656ffd
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stack.sh
View File

@ -83,7 +83,8 @@ fi
# If ``localrc`` exists, then ``stackrc`` will load those settings. This is # If ``localrc`` exists, then ``stackrc`` will load those settings. This is
# useful for changing a branch or repository to test other versions. Also you # useful for changing a branch or repository to test other versions. Also you
# can store your other settings like **MYSQL_PASSWORD** or **ADMIN_PASSWORD** instead # can store your other settings like **MYSQL_PASSWORD** or **ADMIN_PASSWORD** instead
# of letting devstack generate random ones for you. # of letting devstack generate random ones for you. You can customize
# which services to install as well in your localrc.
source ./stackrc source ./stackrc
# Destination path for installation ``DEST`` # Destination path for installation ``DEST``
@ -181,9 +182,6 @@ M_HOST=${M_HOST:-localhost}
# Melange MAC Address Range # Melange MAC Address Range
M_MAC_RANGE=${M_MAC_RANGE:-FE-EE-DD-00-00-00/24} M_MAC_RANGE=${M_MAC_RANGE:-FE-EE-DD-00-00-00/24}
# Specify which services to launch. These generally correspond to screen tabs
ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit}
# Name of the lvm volume group to use/create for iscsi volumes # Name of the lvm volume group to use/create for iscsi volumes
VOLUME_GROUP=${VOLUME_GROUP:-nova-volumes} VOLUME_GROUP=${VOLUME_GROUP:-nova-volumes}
VOLUME_NAME_PREFIX=${VOLUME_NAME_PREFIX:-volume-} VOLUME_NAME_PREFIX=${VOLUME_NAME_PREFIX:-volume-}

8
stackrc
View File

@ -1,6 +1,14 @@
# Find the other rc files # Find the other rc files
RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd) RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd)
# Specify which services to launch. These generally correspond to
# screen tabs. If you like to add other services that are not enabled
# by default you can append them in your ENABLED_SERVICES variable in
# your localrc. For example for swift you can just add this in your
# localrc to add it with the other services:
# ENABLED_SERVICES="$ENABLED_SERVICES,swift"
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit
# compute service # compute service
NOVA_REPO=https://github.com/openstack/nova.git NOVA_REPO=https://github.com/openstack/nova.git
NOVA_BRANCH=master NOVA_BRANCH=master