X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=utils%2Fenv_prepare%2Fstack_prepare.py;h=c7dae390af1e3311b04c8178c956e717a3631cc6;hb=05094807a0908e314e81d2d1c79255856ff2bcf2;hp=37b523d149060cfb2b42beb1e24fbdf04c6dd684;hpb=14f84a307691cc17d02ec10dd07cf5f3e2c03705;p=bottlenecks.git diff --git a/utils/env_prepare/stack_prepare.py b/utils/env_prepare/stack_prepare.py index 37b523d1..c7dae390 100644 --- a/utils/env_prepare/stack_prepare.py +++ b/utils/env_prepare/stack_prepare.py @@ -13,27 +13,53 @@ import errno from utils.logger import Logger from utils.parser import Parser as config import utils.infra_setup.heat.manager as utils +import utils.infra_setup.runner.docker_env as docker_env LOG = Logger(__name__).getLogger() -def _prepare_env_daemon(): - - installer_ip = os.environ.get('INSTALLER_IP', 'undefined') - installer_type = os.environ.get('INSTALLER_TYPE', 'undefined') +def _prepare_env_daemon(test_yardstick): rc_file = config.bottlenecks_config["rc_dir"] - _get_remote_rc_file(rc_file, installer_ip, installer_type) + if not os.path.exists(rc_file): + installer_ip = os.environ.get('INSTALLER_IP', 'undefined') + installer_type = os.environ.get('INSTALLER_TYPE', 'undefined') + _get_remote_rc_file(rc_file, installer_ip, installer_type) _source_file(rc_file) - _append_external_network(rc_file) + if not os.environ.get("EXTERNAL_NETWORK"): + _append_external_network(rc_file) + if test_yardstick: + yardstick_contain = docker_env.yardstick_info["container"] + cmd = "cp %s %s" % (rc_file, + 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) +def file_copy(src_file, dest_file): + src = file(src_file, "r+") + des = file(dest_file, "w+") + des.writelines(src.read()) + src.close() + des.close() + + def _get_remote_rc_file(rc_file, installer_ip, installer_type): RELENG_DIR = config.bottlenecks_config["releng_dir"]