diff options
Diffstat (limited to 'utils/infra_setup')
| -rwxr-xr-x | utils/infra_setup/heat/common.py | 16 | ||||
| -rw-r--r-- | utils/infra_setup/runner/yardstick.py | 4 |
2 files changed, 13 insertions, 7 deletions
diff --git a/utils/infra_setup/heat/common.py b/utils/infra_setup/heat/common.py index a0d6d83c..f0512b0f 100755 --- a/utils/infra_setup/heat/common.py +++ b/utils/infra_setup/heat/common.py @@ -66,14 +66,16 @@ def get_session_auth(): def get_session(): auth = get_session_auth() - try: - cacert = os.environ['OS_CACERT'] - except KeyError: - return session.Session(auth=auth) - else: - insecure = os.getenv('OS_INSECURE', '').lower() == 'true' - cacert = False if insecure else cacert + if os.getenv('OS_INSECURE', '').lower() == 'true': + cacert = False return session.Session(auth=auth, verify=cacert) + else: + try: + cacert = os.environ['OS_CACERT'] + except KeyError: + return session.Session(auth=auth) + else: + return session.Session(auth=auth, verify=cacert) def get_endpoint(service_type, endpoint_type='publicURL'): diff --git a/utils/infra_setup/runner/yardstick.py b/utils/infra_setup/runner/yardstick.py index 3eeeee6b..562e918f 100644 --- a/utils/infra_setup/runner/yardstick.py +++ b/utils/infra_setup/runner/yardstick.py @@ -45,6 +45,10 @@ def yardstick_command_parser(debug, cidr, outfile, parameter): cmd += " --output-file " + outfile image_name = config.bottlenecks_config["yardstick_image_name"] parameter["image_name"] = image_name + DEPLOY_SCENARIO = os.getenv("DEPLOY_SCENARIO") + if DEPLOY_SCENARIO: + if "ovs" in DEPLOY_SCENARIO: + parameter["dpdk_enabled"] = True LOG.info(parameter) if parameter is not None: cmd += " --task-args " + '"' + str(parameter) + '"' |