Merge "Rally keystone test scenarios for v3"

diff --cc functest/ci/prepare_env.py
index 77bb14a,45e19a4..74c751a
--- 1/functest/ci/prepare_env.py
--- 2/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()