diff options
| author |   ting wu <ting.wu@enea.com> | 2018-01-16 13:27:28 +0100 |
|---|---|---|
| committer | ting wu <ting.wu@enea.com> | 2018-01-26 10:15:39 +0100 |
| commit | 7b3cc9cddc9ecda27b1d8dc82b18a97264efe57a (patch) | |
| tree | 6e302ef6fb96b1a0091d0b8f989b62225bb6e29e | |
| parent | 07871f9503e4abbc0d4fee05f0b87cce782f5c3c (diff) | |
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 <ting.wu@enea.com>
| -rw-r--r-- | etc/yardstick/nodes/fuel_baremetal/pod.yaml | 20 | ||||
| -rwxr-xr-x | tests/ci/prepare_env.sh | 5 |
2 files changed, 15 insertions, 10 deletions
diff --git a/etc/yardstick/nodes/fuel_baremetal/pod.yaml b/etc/yardstick/nodes/fuel_baremetal/pod.yaml index acdb44741..5ce555293 100644 --- a/etc/yardstick/nodes/fuel_baremetal/pod.yaml +++ b/etc/yardstick/nodes/fuel_baremetal/pod.yaml @@ -23,29 +23,29 @@ nodes: name: node1 role: Controller ip: ip1 - user: root - key_filename: /root/.ssh/id_rsa + user: node_username + key_filename: node_keyfile - name: node2 role: Controller ip: ip2 - user: root - key_filename: /root/.ssh/id_rsa + user: node_username + key_filename: node_keyfile - name: node3 role: Controller ip: ip3 - user: root - key_filename: /root/.ssh/id_rsa + user: node_username + key_filename: node_keyfile - name: node4 role: Compute ip: ip4 - user: root - key_filename: /root/.ssh/id_rsa + user: node_username + key_filename: node_keyfile - name: node5 role: Compute ip: ip5 - user: root - key_filename: /root/.ssh/id_rsa + user: node_username + key_filename: node_keyfile 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 |