Browse code

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

Jenkins authored on 2014/02/11 15:40:44
Showing 1 changed files
... ...
@@ -389,6 +389,10 @@ function create_nova_conf() {
389 389
     fi
390 390
 
391 391
     if is_service_enabled n-api; then
392
+        if is_service_enabled n-api-meta; then
393
+            # If running n-api-meta as a separate service
394
+            NOVA_ENABLED_APIS=$(echo $NOVA_ENABLED_APIS | sed "s/,metadata//")
395
+        fi
392 396
         iniset $NOVA_CONF DEFAULT enabled_apis "$NOVA_ENABLED_APIS"
393 397
         if is_service_enabled tls-proxy; then
394 398
             # Set the service port for a proxy to take the original