X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fenv_prepare%2Fstack_prepare.py;h=c1604f4da2bf974dc0ecf290d2785e680b19a931;hb=952db3aa4d1fe889c524d1d70bde0479e638f53e;hp=25c2a29b89dd10583d5c2a1e3c95484176df5b1c;hpb=ea7c865700a777f6b99206d3f00fc6ed54001d2d;p=bottlenecks.git diff --git a/utils/env_prepare/stack_prepare.py b/utils/env_prepare/stack_prepare.py index 25c2a29b..c1604f4d 100644 --- a/utils/env_prepare/stack_prepare.py +++ b/utils/env_prepare/stack_prepare.py @@ -37,6 +37,16 @@ def _prepare_env_daemon(test_yardstick): config.bottlenecks_config["yardstick_rc_dir"]) docker_env.docker_exec_cmd(yardstick_contain, cmd) + file_orig = ("/home/opnfv/repos/yardstick/etc" + "/yardstick/yardstick.conf.sample") + file_after = "/etc/yardstick/yardstick.conf" + cmd = "cp %s %s" % (file_orig, + file_after) + docker_env.docker_exec_cmd(yardstick_contain, + cmd) + cmd = "sed -i '12s/http/file/g' /etc/yardstick/yardstick.conf" + docker_env.docker_exec_cmd(yardstick_contain, + cmd) # update the external_network _source_file(rc_file) @@ -73,7 +83,8 @@ def _source_file(rc_file): p = subprocess.Popen(". %s; env" % rc_file, stdout=subprocess.PIPE, shell=True) output = p.communicate()[0] - env = dict((line.split('=', 1) for line in output.splitlines())) + output_lines = output.splitlines() + env = dict((line.split('=', 1) for line in output_lines)) os.environ.update(env) return env