From d2277611a37ed711b54ae93676822e6999f35c7f Mon Sep 17 00:00:00 2001
From: Joe Gordon <joe.gordon0@gmail.com>
Date: Tue, 21 Jan 2014 18:02:50 -0800
Subject: [PATCH] Add support to run nova-api-metadata as separate binary

nova-api-metadata is commonly run as a separate binary in production and
devstack already has support to do this. Just wire up devstack-gate to
support this mode.

Config patch: Id7169e9ec72a934c2c2116f6e6156419b51b104f

Change-Id: Iddd44f7ee43b9287a788dea49eaa484316f8da04
Related-Bug: #1270845
---
 devstack-vm-gate-wrap.sh | 3 +++
 devstack-vm-gate.sh      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index 9c800828..4f41ccdf 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -134,6 +134,9 @@ export DEVSTACK_GATE_NEUTRON=${DEVSTACK_GATE_NEUTRON:-0}
 # Set to 1 to run nova in cells mode instead of the default mode
 export DEVSTACK_GATE_CELLS=${DEVSTACK_GATE_CELLS:-0}
 
+# Set to 1 to run nova in with nova metadata server as a separate binary
+export DEVSTACK_GATE_NOVA_API_METADATA_SPLIT=${DEVSTACK_GATE_NOVA_API_METADATA_SPLIT:-0}
+
 # Set to 1 to run ironic baremetal provisioning service.
 export DEVSTACK_GATE_IRONIC=${DEVSTACK_GATE_IRONIC:-0}
 
diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index b22a76eb..061cc9b0 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -96,6 +96,9 @@ function setup_localrc() {
         else
             MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-net
         fi
+        if [ "$DEVSTACK_GATE_NOVA_API_METADATA_SPLIT" -eq "1" ]; then
+            MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-api-meta
+        fi
         if [ "$DEVSTACK_GATE_CELLS" -eq "1" ]; then
             MY_ENABLED_SERVICES=$MY_ENABLED_SERVICES,n-cell
         fi