Merge "Make neutron the default in devstack"

This commit is contained in:
Jenkins 2015-02-02 20:09:54 +00:00 committed by Gerrit Code Review
commit 393acc0a24

18
stackrc
View File

@ -32,15 +32,11 @@ REGION_NAME=${REGION_NAME:-RegionOne}
# ``disable_service`` functions in ``local.conf``. # ``disable_service`` functions in ``local.conf``.
# For example, to enable Swift add this to ``local.conf``: # For example, to enable Swift add this to ``local.conf``:
# enable_service s-proxy s-object s-container s-account # enable_service s-proxy s-object s-container s-account
# In order to enable Neutron (a single node setup) add the following # In order to enable nova-networking add the following settings in
# settings in ``local.conf``: # `` local.conf ``:
# [[local|localrc]] # [[local|localrc]]
# disable_service n-net # disable_service q-svc q-agt q-dhcp q-l3 q-meta
# enable_service q-svc # enable_service n-net
# enable_service q-agt
# enable_service q-dhcp
# enable_service q-l3
# enable_service q-meta
# # Optional, to enable tempest configuration as part of devstack # # Optional, to enable tempest configuration as part of devstack
# enable_service tempest # enable_service tempest
function isset { function isset {
@ -54,14 +50,16 @@ function isset {
# this allows us to pass ENABLED_SERVICES # this allows us to pass ENABLED_SERVICES
if ! isset ENABLED_SERVICES ; then if ! isset ENABLED_SERVICES ; then
# core compute (glance / keystone / nova (+ nova-network)) # core compute (glance / keystone / nova)
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,n-sch,n-xvnc,n-cauth ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-cond,n-sch,n-xvnc,n-cauth
# cinder # cinder
ENABLED_SERVICES+=,c-sch,c-api,c-vol ENABLED_SERVICES+=,c-sch,c-api,c-vol
# heat # heat
ENABLED_SERVICES+=,h-eng,h-api,h-api-cfn,h-api-cw ENABLED_SERVICES+=,h-eng,h-api,h-api-cfn,h-api-cw
# dashboard # dashboard
ENABLED_SERVICES+=,horizon ENABLED_SERVICES+=,horizon
# neutron
ENABLED_SERVICES+=,q-svc,q-agt,q-dhcp,q-l3,q-meta
# additional services # additional services
ENABLED_SERVICES+=,rabbit,tempest,mysql ENABLED_SERVICES+=,rabbit,tempest,mysql
fi fi