From 340d2388d2e0a9d63ed1e0fcc113c0561132968e Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Sat, 16 Aug 2014 09:57:55 -0700
Subject: [PATCH] Add support for zaqar.

Add support for zaqar in a backward compatible manner (marconi should
still work). The marconi bits will need to be cleaned up in the future.

Change-Id: Ib10f24aaa9e6d341b5bde14ee5f101e72999a9a8
---
 devstack-vm-gate-wrap.sh | 8 +++++---
 features.yaml            | 6 ++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index f664ed49..574b0cc7 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -52,7 +52,7 @@ PROJECTS="openstack/horizon $PROJECTS"
 PROJECTS="openstack/ironic $PROJECTS"
 PROJECTS="openstack/keystone $PROJECTS"
 PROJECTS="openstack/keystonemiddleware $PROJECTS"
-PROJECTS="openstack/marconi $PROJECTS"
+PROJECTS="openstack/zaqar $PROJECTS"
 PROJECTS="openstack/neutron $PROJECTS"
 PROJECTS="openstack/nova $PROJECTS"
 PROJECTS="openstack/os-apply-config $PROJECTS"
@@ -73,7 +73,7 @@ PROJECTS="openstack/python-glanceclient $PROJECTS"
 PROJECTS="openstack/python-heatclient $PROJECTS"
 PROJECTS="openstack/python-ironicclient $PROJECTS"
 PROJECTS="openstack/python-keystoneclient $PROJECTS"
-PROJECTS="openstack/python-marconiclient $PROJECTS"
+PROJECTS="openstack/python-zaqarclient $PROJECTS"
 PROJECTS="openstack/python-neutronclient $PROJECTS"
 PROJECTS="openstack/python-novaclient $PROJECTS"
 PROJECTS="openstack/python-openstackclient $PROJECTS"
@@ -186,8 +186,10 @@ export DEVSTACK_GATE_SAHARA=${DEVSTACK_GATE_SAHARA:-0}
 # Set to 1 to run trove
 export DEVSTACK_GATE_TROVE=${DEVSTACK_GATE_TROVE:-0}
 
-# Set to 1 to run marconi
+# Set to 1 to run marconi/zaqar
+# TODO remove marconi when safe to do so
 export DEVSTACK_GATE_MARCONI=${DEVSTACK_GATE_MARCONI:-0}
+export DEVSTACK_GATE_ZAQAR=${DEVSTACK_GATE_ZAQAR:-0}
 
 # Set to 0 to disable config_drive and use the metadata server instead
 export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-1}
diff --git a/features.yaml b/features.yaml
index 0cd5d718..139b7db3 100644
--- a/features.yaml
+++ b/features.yaml
@@ -25,6 +25,8 @@ config:
     features: [trove]
   marconi:
     features: [marconi]
+  zaqar:
+    features: [zaqar]
   sahara:
     features: [sahara]
   ironic:
@@ -115,6 +117,10 @@ features:
     base:
       services: [marconi-server]
 
+  zaqar:
+    base:
+      services: [marconi-server]
+
   tempest:
     base:
       services: [tempest]