diff options
| author |   mei mei <meimei@huawei.com> | 2019-06-10 03:16:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-06-10 03:16:32 +0000 |
| commit | 759b8bcbf61ffd0940acfd138a440fb8debc00ad (patch) | |
| tree | 671614225fe72972d0d2e36c75e7737cd9ee6167 | |
| parent | f90b8b66834b81b1022a05e14392857e77fccfca (diff) | |
| parent | a14569694d3c564dbf09653acb489357e84c9e90 (diff) | |
Merge "bugfix: change the path of id_rsa"
| -rwxr-xr-x | jjb/dovetail/dovetail-run.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh index ef11fc15a..0440c4beb 100755 --- a/jjb/dovetail/dovetail-run.sh +++ b/jjb/dovetail/dovetail-run.sh @@ -206,13 +206,13 @@ get_fuel_baremetal_pod_file() { cat << EOF >${POD} nodes: -- {ip: ${INSTALLER_IP}, name: node0, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, +- {ip: ${INSTALLER_IP}, name: node0, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: Jumpserver, user: ${ssh_user}} -- {ip: ${fuel_ctl_ip}, name: node1, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, +- {ip: ${fuel_ctl_ip}, name: node1, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}, ipmi_ip: ${ipmiIp}, ipmi_user: ${ipmiUser}, ipmi_password: ${ipmiPass}} -- {ip: ${fuel_msg_ip}, name: msg01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}} -- {ip: ${fuel_cmp_ip}, name: cmp01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}} -- {ip: ${fuel_dbs_ip}, name: dbs01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}} +- {ip: ${fuel_msg_ip}, name: msg01, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}} +- {ip: ${fuel_cmp_ip}, name: cmp01, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}} +- {ip: ${fuel_dbs_ip}, name: dbs01, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}} EOF } @@ -241,7 +241,7 @@ get_pod_file_with_scripts() { cmd="sudo python ${releng_repo}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \ -i ${INSTALLER_IP} ${options} -f ${POD} \ - -s /home/opnfv/userconfig/pre_config/id_rsa" + -s ${DOVETAIL_CONFIG}/id_rsa" echo "INFO: cmd is ${cmd}" ${cmd} |