Browse code

Merge "enable tempest by default"

Jenkins authored on 2012/12/13 02:52:54
Showing 1 changed files
... ...
@@ -14,7 +14,7 @@ DATABASE_TYPE=mysql
14 14
 # ``disable_service`` functions in ``localrc``.
15 15
 # For example, to enable Swift add this to ``localrc``:
16 16
 # enable_service swift
17
-ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,cinder,c-sch,c-api,c-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,rabbit,$DATABASE_TYPE
17
+ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,cinder,c-sch,c-api,c-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,rabbit,tempest,$DATABASE_TYPE
18 18
 
19 19
 # Set the default Nova APIs to enable
20 20
 NOVA_ENABLED_APIS=ec2,osapi_compute,metadata