From 1e4e3acaadc1397a7d69a83e8fe9a54dd879983a Mon Sep 17 00:00:00 2001
From: Malini Kamalambal <malini.kamalambal@rackspace.com>
Date: Fri, 14 Feb 2014 11:29:26 -0500
Subject: [PATCH] Revert the tempest service name to marconi

This patch is to rollback the change introduced by
https://review.openstack.org/#/c/73100/. 73100 is no longer needed
because of the recent https://review.openstack.org/#/c/69497/.
Using 'marconi' as the service name will keep us aligned with the
naming convention used by other projects.

Change-Id: I5da6d2aaeb5c9dc29a1cbc70c8425449807eb34c
---
 lib/marconi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/marconi b/lib/marconi
index 0aaff1bd58..d1ab5f3a5c 100644
--- a/lib/marconi
+++ b/lib/marconi
@@ -52,7 +52,7 @@ MARCONICLIENT_REPO=${MARCONICLIENT_REPO:-${GIT_BASE}/openstack/python-marconicli
 MARCONICLIENT_BRANCH=${MARCONICLIENT_BRANCH:-master}
 
 # Tell Tempest this project is present
-TEMPEST_SERVICES+=,marconi-server
+TEMPEST_SERVICES+=,marconi
 
 
 # Functions