X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=tests%2Fci%2Fprepare_env.sh;h=d7c60d48f722a052092e953d077d08de42171e2c;hb=7262ad1b008f74b51460ce07986458ca3bfe8cc8;hp=886e50e2139f3531754cae22263415c255aabd05;hpb=8544a361f831f324eae33f8a48b94bf2a34f5ab0;p=yardstick.git

diff --git a/tests/ci/prepare_env.sh b/tests/ci/prepare_env.sh
index 886e50e21..d7c60d48f 100755
--- a/tests/ci/prepare_env.sh
+++ b/tests/ci/prepare_env.sh
@@ -72,10 +72,12 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
 
     # update "ip" according to the CI env
     ssh -l ubuntu "${INSTALLER_IP}" -i ${SSH_KEY} ${ssh_options} \
-         "sudo salt -C 'ctl* or cmp*' grains.get fqdn_ip4  --out yaml">node_info
+         "sudo salt -C 'ctl* or cmp* or odl01* or gtw*' grains.get fqdn_ip4  --out yaml">node_info
 
-    controller_ips=($(awk '/ctl/{getline; print $2} < node_info'))
-    compute_ips=($(awk '/cmp/{getline; print $2} < node_info'))
+    controller_ips=($(awk '/ctl/{getline; print $2}' < node_info))
+    compute_ips=($(awk '/cmp/{getline; print $2}' < node_info))
+    odl_ip=($(awk '/odl01/{getline; print $2}' < node_info))
+    gateway_ip=($(awk '/gtw/{getline; print $2}' < node_info))
 
     if [[ ${controller_ips[0]} ]]; then
         sed -i "s|ip1|${controller_ips[0]}|" "${pod_yaml}"
@@ -92,6 +94,12 @@ if [ "$INSTALLER_TYPE" == "fuel" ]; then
     if [[ ${compute_ips[1]} ]]; then
         sed -i "s|ip5|${compute_ips[1]}|" "${pod_yaml}"
     fi
+    if [[ ${odl_ip[0]} ]]; then
+        sed -i "s|ip6|${odl_ip[0]}|" "${pod_yaml}"
+    fi
+    if [[ ${gateway_ip[0]} ]]; then
+        sed -i "s|ip7|${gateway_ip[0]}|" "${pod_yaml}"
+    fi
 
     # update 'user' and 'key_filename' according to the CI env
     sed -i "s|node_username|${USER_NAME}|;s|node_keyfile|${SSH_KEY}|" "${pod_yaml}"