Merge "Revert the tempest service name to marconi"

This commit is contained in:
Jenkins 2014-02-15 01:54:29 +00:00 committed by Gerrit Code Review
commit 745f3933b1

View File

@ -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