diff options
| author |   JingLu5 <lvjing5@huawei.com> | 2017-06-30 06:27:23 +0000 |
|---|---|---|
| committer | Jing Lu <lvjing5@huawei.com> | 2017-07-05 03:55:48 +0000 |
| commit | 961de9447288c431a47a42a31a70df23ccc726eb (patch) | |
| tree | 74bb9122f076e51c2e69bf645026943f8ccc460d | |
| parent | 7bdb37105fb4520abba6568c85e1cf17dc4aafe6 (diff) | |
Use "OS_INSECURE" variable as the insecure mode indicator
Now we use "OS_CACERT" as the insecure mode indicator, it is better to use "OS_INSECURE".
Change-Id: I1406193e27510390b4b8fd8f4751d8361560172f
Signed-off-by: JingLu5 <lvjing5@huawei.com>
(cherry picked from commit a2176af5514fc55ad8421635ad70ce4f26890ed6)
7 files changed, 9 insertions, 8 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh index f25006487..b3363cb12 100755 --- a/tests/ci/clean_images.sh +++ b/tests/ci/clean_images.sh @@ -15,7 +15,7 @@ cleanup() echo echo "========== Cleanup ==========" - if [ $OS_CACERT ] && [ "$(echo $OS_CACERT | tr '[:upper:]' '[:lower:]')" = "false" ]; then + if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then SECURE="--insecure" else SECURE="" diff --git a/tests/ci/load_images.sh b/tests/ci/load_images.sh index 2ae80ea8e..bfe1184a1 100755 --- a/tests/ci/load_images.sh +++ b/tests/ci/load_images.sh @@ -256,7 +256,7 @@ main() RAW_IMAGE='/home/opnfv/images/yardstick-image.tar.gz' fi - if [ $OS_CACERT ] && [ "$(echo $OS_CACERT | tr '[:upper:]' '[:lower:]')" = "false" ]; then + if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then SECURE="--insecure" else SECURE="" diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash index 8737836e2..aee516ea9 100644 --- a/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash +++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/create_flavor.bash @@ -14,7 +14,7 @@ set -e -if [ $OS_CACERT ] && [ "$(echo $OS_CACERT | tr '[:upper:]' '[:lower:]')" = "false" ]; then +if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then SECURE="--insecure" else SECURE="" diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash index 617dcf8a3..d39926fc5 100644 --- a/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash +++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/delete_flavor.bash @@ -14,7 +14,7 @@ set -e -if [ $OS_CACERT ] && [ "$(echo $OS_CACERT | tr '[:upper:]' '[:lower:]')" = "false" ]; then +if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then SECURE="--insecure" else SECURE="" diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/show_flavors.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/show_flavors.bash index 9b413c965..bd61ba9bb 100644 --- a/yardstick/benchmark/scenarios/availability/ha_tools/nova/show_flavors.bash +++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/show_flavors.bash @@ -13,7 +13,7 @@ set -e -if [ $OS_CACERT ] && [ "$(echo $OS_CACERT | tr '[:upper:]' '[:lower:]')" = "false" ]; then +if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then SECURE="--insecure" else SECURE="" diff --git a/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py b/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py index d757bd88d..a0777f94e 100644 --- a/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py +++ b/yardstick/benchmark/scenarios/availability/monitor/monitor_command.py @@ -56,11 +56,11 @@ class MonitorOpenstackCmd(basemonitor.BaseMonitor): self.cmd = self._config["command_name"] try: - cacert = os.environ['OS_CACERT'] + insecure = os.environ['OS_INSECURE'] except KeyError: pass else: - if cacert.lower() == "false": + if insecure.lower() == "true": self.cmd = self.cmd + " --insecure" def monitor_func(self): diff --git a/yardstick/common/openstack_utils.py b/yardstick/common/openstack_utils.py index 1f08344e4..8787e605a 100644 --- a/yardstick/common/openstack_utils.py +++ b/yardstick/common/openstack_utils.py @@ -79,7 +79,8 @@ def get_session(): except KeyError: return session.Session(auth=auth) else: - cacert = False if cacert.lower() == "false" else cacert + insecure = os.getenv('OS_INSECURE', '').lower() == 'true' + cacert = False if insecure else cacert return session.Session(auth=auth, verify=cacert) |