summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormei mei <meimei@huawei.com>2018-05-18 08:17:39 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-05-18 08:17:39 +0000
commit47e912753dfbd977499ab8ce8f072a1d293a5410 (patch)
tree94bde76f1b945c44bb52551067fe1f257765979b
parent1028e3a9ac72fd755d86670b05178c7aefcce315 (diff)
parent82186f604ac1cdb4d65c541555d5278a5f875514 (diff)
Merge "[Dovetail] Changing the path of the ssh key in pod.yaml for yardstick"
-rwxr-xr-xjjb/dovetail/dovetail-run.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 9616fb3..df681dd 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -124,7 +124,7 @@ if [[ ! "${SUT_BRANCH}" =~ "danube" && ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_T
awk '{print \$2; exit}'") &> /dev/null
cat << EOF >${DOVETAIL_CONFIG}/pod.yaml
nodes:
-- {ip: ${fuel_ctl_ip}, name: node1, key_filename: /root/.ssh/id_rsa, role: controller, user: ${ssh_user}}
+- {ip: ${fuel_ctl_ip}, name: node1, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}}
EOF
fi
@@ -154,7 +154,8 @@ if [[ ! -f ${DOVETAIL_CONFIG}/pod.yaml ]]; then
fi
cmd="sudo python ${releng_repo}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \
- -i ${INSTALLER_IP} ${options} -f ${DOVETAIL_CONFIG}/pod.yaml"
+ -i ${INSTALLER_IP} ${options} -f ${DOVETAIL_CONFIG}/pod.yaml \
+ -s /home/opnfv/userconfig/pre_config/id_rsa"
echo ${cmd}
${cmd}