Browse code

Move ENABLED_SERVICES to stackrc.

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

Chmouel Boudjnah authored on 2012/03/09 23:21:40
Showing 2 changed files
... ...
@@ -83,7 +83,8 @@ fi
83 83
 # If ``localrc`` exists, then ``stackrc`` will load those settings.  This is
84 84
 # useful for changing a branch or repository to test other versions.  Also you
85 85
 # can store your other settings like **MYSQL_PASSWORD** or **ADMIN_PASSWORD** instead
86
-# of letting devstack generate random ones for you.
86
+# of letting devstack generate random ones for you. You can customize
87
+# which services to install as well in your localrc.
87 88
 source ./stackrc
88 89
 
89 90
 # Destination path for installation ``DEST``
... ...
@@ -181,9 +182,6 @@ M_HOST=${M_HOST:-localhost}
181 181
 # Melange MAC Address Range
182 182
 M_MAC_RANGE=${M_MAC_RANGE:-FE-EE-DD-00-00-00/24}
183 183
 
184
-# Specify which services to launch.  These generally correspond to screen tabs
185
-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}
186
-
187 184
 # Name of the lvm volume group to use/create for iscsi volumes
188 185
 VOLUME_GROUP=${VOLUME_GROUP:-nova-volumes}
189 186
 VOLUME_NAME_PREFIX=${VOLUME_NAME_PREFIX:-volume-}
... ...
@@ -1,6 +1,14 @@
1 1
 # Find the other rc files
2 2
 RC_DIR=$(cd $(dirname "$BASH_SOURCE") && pwd)
3 3
 
4
+# Specify which services to launch.  These generally correspond to
5
+# screen tabs. If you like to add other services that are not enabled
6
+# by default you can append them in your ENABLED_SERVICES variable in
7
+# your localrc. For example for swift you can just add this in your
8
+# localrc to add it with the other services:
9
+# ENABLED_SERVICES="$ENABLED_SERVICES,swift"
10
+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
11
+
4 12
 # compute service
5 13
 NOVA_REPO=https://github.com/openstack/nova.git
6 14
 NOVA_BRANCH=master