Skip to content

Commit e3e9b22

Browse files
committed
Revert "Make neutron the default in devstack"
The simple case of a single interface doesn't work out of the box, and this is now failing for lots of people. We need to back up and get that working. This reverts commit c906bb3. Change-Id: If20df670e06cda2d65028bceb46d257d011cf917
1 parent c906bb3 commit e3e9b22

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

stackrc

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,15 @@ REGION_NAME=${REGION_NAME:-RegionOne}
3232
# ``disable_service`` functions in ``local.conf``.
3333
# For example, to enable Swift add this to ``local.conf``:
3434
# enable_service s-proxy s-object s-container s-account
35-
# In order to enable nova-networking add the following settings in
36-
# `` local.conf ``:
35+
# In order to enable Neutron (a single node setup) add the following
36+
# settings in ``local.conf``:
3737
# [[local|localrc]]
38-
# disable_service q-svc q-agt q-dhcp q-l3 q-meta
39-
# enable_service n-net
38+
# disable_service n-net
39+
# enable_service q-svc
40+
# enable_service q-agt
41+
# enable_service q-dhcp
42+
# enable_service q-l3
43+
# enable_service q-meta
4044
# # Optional, to enable tempest configuration as part of devstack
4145
# enable_service tempest
4246
function isset {
@@ -50,16 +54,14 @@ function isset {
5054

5155
# this allows us to pass ENABLED_SERVICES
5256
if ! isset ENABLED_SERVICES ; then
53-
# core compute (glance / keystone / nova)
54-
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-cond,n-sch,n-xvnc,n-cauth
57+
# core compute (glance / keystone / nova (+ nova-network))
58+
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
5559
# cinder
5660
ENABLED_SERVICES+=,c-sch,c-api,c-vol
5761
# heat
5862
ENABLED_SERVICES+=,h-eng,h-api,h-api-cfn,h-api-cw
5963
# dashboard
6064
ENABLED_SERVICES+=,horizon
61-
# neutron
62-
ENABLED_SERVICES+=,q-svc,q-agt,q-dhcp,q-l3,q-meta
6365
# additional services
6466
ENABLED_SERVICES+=,rabbit,tempest,mysql
6567
fi

0 commit comments

Comments
 (0)