From 7b3cc9cddc9ecda27b1d8dc82b18a97264efe57a Mon Sep 17 00:00:00 2001 From: ting wu Date: Tue, 16 Jan 2018 13:27:28 +0100 Subject: Modify fuel_baremetal pod config file The current HA testcases failed on fuel baremetal installer with reason "SSHTimeout". This is due to incorrect ssh login info in the pod config file. The change is to by running 'prepare_env.sh' script to - read env vars 'USER_NAME' and 'SSH_KEY' - replace the 'node_username' to env var 'USER_NAME' - replace the "node_keyfile" to env var 'SSH_KEY' JIRA: ARMBAND-317 Change-Id: I0239892f447ae99ab4025eedcd133e1b6f04e5a5 Signed-off-by: ting wu --- tests/ci/prepare_env.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tests') diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh index 44e2694f7..262b74c09 100755 --- a/tests/ci/prepare_env.sh +++ b/tests/ci/prepare_env.sh @@ -14,6 +14,8 @@ : ${INSTALLER_TYPE:='unknown'} : ${NODE_NAME:='unknown'} : ${EXTERNAL_NETWORK:='admin_floating_net'} +: ${USER_NAME:='ubuntu'} +: ${SSH_KEY:='/root/.ssh/id_rsa'} # Extract network name from EXTERNAL_NETWORK # e.g. EXTERNAL_NETWORK='ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24' @@ -97,6 +99,9 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then node_line_num=($(grep -n node[1-5] $pod_yaml | awk -F: '{print $1}')) node_ID=0; + # update 'user' and 'key_filename' according to CI env + sed -i "s|node_username|${USER_NAME}|;s|node_keyfile|${SSH_KEY}|" $pod_yaml; + if [[ ${controller_ips[0]} ]]; then sed -i "${node_line_num[0]}s/node1/node$((++node_ID))/;s/ip1/${controller_ips[0]}/" $pod_yaml; fi -- cgit 1.2.3-korg