merge #15 request from frank-borkin

Deepinder Setia · Deepinder Setia · commit 85a58f524021 · 2013-11-20T14:09:41.000-08:00
diff --git a/contrail/localrc-multinode-compute b/contrail/localrc-multinode-compute
@@ -21,7 +21,7 @@ DEBUG=True
 LOGFILE=$STACK_DIR/log/stack.log
 LOGDAYS=1
 
-ENABLED_SERVICES=n-cpu,rabbit,g-api,neutron,q-agt,agent,vif
+ENABLED_SERVICES=n-cpu,rabbit,g-api,neutron,agent,vif
 
 Q_USE_DEBUG_COMMAND=True
 PHYSICAL_NETWORK=default
diff --git a/contrail/localrc-multinode-server b/contrail/localrc-multinode-server
@@ -23,12 +23,12 @@ LOGDAYS=1
 
 disable_service n-net
 enable_service q-svc
-enable_service q-dhcp
 enable_service q-meta
 enable_service neutron
 enable_service rabbit
 
 # not used by contrail
+disable_service q-dhcp
 disable_service q-l3
 disable_service q-agt
 enable_service contrail
diff --git a/contrail/localrc-single b/contrail/localrc-single
@@ -7,9 +7,9 @@ LOGDAYS=1
 
 disable_service n-net
 enable_service q-svc
-enable_service q-agt
-enable_service q-dhcp
-enable_service q-l3
+disable_service q-agt
+disable_service q-dhcp
+disable_service q-l3
 enable_service q-meta
 enable_service neutron
 enable_service contrail
diff --git a/contrail/localrc.compute b/contrail/localrc.compute
@@ -8,7 +8,7 @@ HOST_IP=10.84.13.34
 # Set this to IP address of config (master) node
 SERVICE_HOST=10.84.13.1
 
-ENABLED_SERVICES=n-cpu,rabbit,q-agt,agent
+ENABLED_SERVICES=n-cpu,rabbit,g-api,neutron,agent,vif
 
 MYSQL_HOST=$SERVICE_HOST
 RABBIT_HOST=$SERVICE_HOST
diff --git a/contrail/localrc.master b/contrail/localrc.master
@@ -1,9 +1,9 @@
 # Enable Neutron
 disable_service n-net
 enable_service q-svc
-enable_service q-agt
-enable_service q-dhcp 
-enable_service q-l3
+disable_service q-agt
+disable_service q-dhcp 
+disable_service q-l3
 enable_service q-meta
 enable_service neutron
 enable_service contrail
