From d57ccf0271e2d416fb0fc73b5ab96f342eae7f28 Mon Sep 17 00:00:00 2001
From: Dan Smith <danms@us.ibm.com>
Date: Thu, 15 Nov 2012 10:09:33 -0800
Subject: [PATCH] Add nova-conductor service

This is a new service for nova that will soon be required for
n-cpu to function.

Change-Id: I9a2e62f25200a47233a7796084ad8ebabc852c59
---
 lib/nova | 3 ++-
 stackrc  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/nova b/lib/nova
index fbb5a012f6..b5efce9619 100644
--- a/lib/nova
+++ b/lib/nova
@@ -434,12 +434,13 @@ function start_nova() {
     screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --config-file $NOVA_CONF --web ."
     screen_it n-xvnc "cd $NOVA_DIR && ./bin/nova-xvpvncproxy --config-file $NOVA_CONF"
     screen_it n-cauth "cd $NOVA_DIR && ./bin/nova-consoleauth"
+    screen_it n-cond "cd $NOVA_DIR && ./bin/nova-conductor"
 }
 
 # stop_nova() - Stop running processes (non-screen)
 function stop_nova() {
     # Kill the nova screen windows
-    for serv in n-api n-cpu n-crt n-net n-sch n-novnc n-xvnc n-cauth; do
+    for serv in n-api n-cpu n-crt n-net n-sch n-novnc n-xvnc n-cauth n-cond; do
         screen -S $SCREEN_NAME -p $serv -X kill
     done
 }
diff --git a/stackrc b/stackrc
index 01e955611a..9588cf99a7 100644
--- a/stackrc
+++ b/stackrc
@@ -14,7 +14,7 @@ DATABASE_TYPE=mysql
 # ``disable_service`` functions in ``localrc``.
 # For example, to enable Swift add this to ``localrc``:
 # enable_service swift
-ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,cinder,c-sch,c-api,c-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,rabbit,$DATABASE_TYPE
+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
 
 # Set the default Nova APIs to enable
 NOVA_ENABLED_APIS=ec2,osapi_compute,metadata