From: Morgan Richomme <morgan.richomme@orange.com>
Date: Wed, 18 Jan 2017 09:29:05 +0000 (+0000)
Subject: Merge "Rally keystone test scenarios for v3"
X-Git-Tag: danube.1.RC1~193
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7e52f05a029811d2174cc6c851e95252bd99632b;p=functest.git

Merge "Rally keystone test scenarios for v3"
---

7e52f05a029811d2174cc6c851e95252bd99632b
diff --cc functest/ci/prepare_env.py
index 77bb14a88,45e19a466..74c751af9
--- a/functest/ci/prepare_env.py
+++ b/functest/ci/prepare_env.py
@@@ -274,11 -271,11 +278,11 @@@ def check_environment()
              logger.error(msg_not_active)
              sys.exit(1)
  
-     logger.info("Functest environment installed.")
+     logger.info("Functest environment is installed.")
  
  
 -def main():
 -    if not (args.action in actions):
 +def main(**kwargs):
 +    if not (kwargs['action'] in actions):
          logger.error('Argument not valid.')
          sys.exit()