Keep creds file name unchanged in Euphrates 83/51483/3
authorLinda Wang <wangwulin@huawei.com>
Fri, 2 Feb 2018 02:18:19 +0000 (02:18 +0000)
committerLinda Wang <wangwulin@huawei.com>
Fri, 2 Feb 2018 08:14:43 +0000 (08:14 +0000)
Change-Id: I216d1877cba73272bbb37bf84c74dbf77dc2952d
Signed-off-by: Linda Wang <wangwulin@huawei.com>
jjb/functest/functest-alpine.sh

index 0f4e80f..b5db2ed 100755 (executable)
@@ -110,8 +110,12 @@ elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then
 elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then
     cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
 fi
-rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
 
+if [[ ${BRANCH} == "stable/euphrates" ]]; then
+    rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/openstack.creds"
+else
+    rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
+fi
 
 # Set iptables rule to allow forwarding return traffic for container
 if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then