Merge "Revert "Remove NoVNC from the default enabled services""

This commit is contained in:
Jenkins 2015-02-16 18:12:14 +00:00 committed by Gerrit Code Review
commit bae736e1e0

View File

@ -55,7 +55,7 @@ function isset {
# this allows us to pass ENABLED_SERVICES
if ! isset ENABLED_SERVICES ; then
# core compute (glance / keystone / nova (+ nova-network))
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-net,n-cond,n-sch,n-novnc,n-xvnc,n-cauth
# cinder
ENABLED_SERVICES+=,c-sch,c-api,c-vol
# heat