commit d73af8787280002321ab52a3262a2d0b5a8e54cd
author Joe Gordon <joe.gordon0@gmail.com> Thu Feb 06 15:33:52 2014 -0800
committer Joe Gordon <joe.gordon0@gmail.com> Sun Feb 09 22:46:36 2014 -0700
tree 30d0efc08e437ff617626467603311044a3f0cf8
parent f583a04d739a189da6f3780f83e2ddc61bfe9e22

If n-api-meta is being run, remove from NOVA_ENABLED_APIS

If running n-api-meta as a separate service we shouldn't run it inside
of n-api. This patch is in support of Iddd44f7ee43b9287a788dea49eaa484316f8da04

Change-Id: I8a54cf13dc6083b78e89c9ea5413d9e4d8d4b37a
Related-Bug: #1270845

lib/nova

diff --git a/lib/nova b/lib/nova
index dbc5c3d..3ee28fa 100644
--- a/lib/nova
+++ b/lib/nova
@@ -389,6 +389,10 @@
     fi
 
     if is_service_enabled n-api; then
+        if is_service_enabled n-api-meta; then
+            # If running n-api-meta as a separate service
+            NOVA_ENABLED_APIS=$(echo $NOVA_ENABLED_APIS | sed "s/,metadata//")
+        fi
         iniset $NOVA_CONF DEFAULT enabled_apis "$NOVA_ENABLED_APIS"
         if is_service_enabled tls-proxy; then
             # Set the service port for a proxy to take the original