Merge "Remove nova-cert from devstack"

This commit is contained in:
Jenkins 2017-05-07 09:34:45 +00:00 committed by Gerrit Code Review
commit 37a2cb11c9
3 changed files with 8 additions and 3 deletions

View File

@ -18,11 +18,16 @@
#
s=rabbit,mysql,key
s+=,n-cpu,n-api,n-crt,n-cond,n-sch,n-cauth,placement-api
s+=,n-cpu,n-api,n-cond,n-sch,n-cauth,placement-api
# n-obj has been removed from mitaka
if [[ "stable/kilo stable/liberty" =~ $ZUUL_BRANCH ]]; then
s+=,n-obj
fi
if [[ "stable/kilo stable/liberty stable/mitaka stable/ocata" =~ $ZUUL_BRANCH ]]; then
s+=,n-crt
fi
s+=,neutron,q-svc,q-agt,q-dhcp,q-meta
s+=,cinder,g-api,g-reg
s+=,c-api,c-vol,c-sch,c-bak,horizon

View File

@ -12,7 +12,7 @@ enable_plugin heat https://git.openstack.org/openstack/heat master
#run the services you want to use
ENABLED_SERVICES=rabbit,mysql,key
ENABLED_SERVICES+=,n-cpu,n-api,n-crt,n-obj,n-cond,n-sch,n-novnc,n-cauth
ENABLED_SERVICES+=,n-cpu,n-api,n-obj,n-cond,n-sch,n-novnc,n-cauth
ENABLED_SERVICES+=,placement-api
ENABLED_SERVICES+=,neutron,q-svc,q-agt,q-dhcp,q-meta
ENABLED_SERVICES+=,cinder,g-api,g-reg

View File

@ -59,7 +59,7 @@ Nova (optional)
.. code-block:: none
enable_service n-cpu n-api n-crt n-cond n-sch n-novnc n-cauth placement-api
enable_service n-cpu n-api n-cond n-sch n-novnc n-cauth placement-api
Neutron (optional)