From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Thu, 5 Nov 2015 14:29:06 +0000 (+0100)
Subject: Add possibility to give Openstack creds file to the docker container
X-Git-Tag: brahmaputra.1.0~281
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F3073%2F2;p=functest.git

Add possibility to give Openstack creds file to the docker container

If the file is given through a docker volume, it will not use
fetch_os_creds.sh, it will source it directly.

Usage:
 Add the following to the docker command line:
    -v $(pwd)/<your_local_creds_file>:/home/opnfv/functest/conf/openstack.creds

Change-Id: I24c20378c940aaa1d9f93d5e6c57b3243b50aab5
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index f3e31d926..1b3144a0d 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -155,15 +155,17 @@ mkdir -p ${FUNCTEST_RESULTS_DIR}/ODL
 
 
 # Create Openstack credentials file
-${REPOS_DIR}/releng/utils/fetch_os_creds.sh -d ${FUNCTEST_CONF_DIR}/openstack.creds \
-    -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}
-retval=$?
-if [ $retval != 0 ]; then
-    error "Cannot retrieve credentials file from installation. Check logs."
-    exit $retval
+if [ ! -f ${FUNCTEST_CONF_DIR}/openstack.creds ]; then
+    ${REPOS_DIR}/releng/utils/fetch_os_creds.sh -d ${FUNCTEST_CONF_DIR}/openstack.creds \
+        -i ${INSTALLER_TYPE} -a ${INSTALLER_IP}
+    retval=$?
+    if [ $retval != 0 ]; then
+        error "Cannot retrieve credentials file from installation. Check logs."
+        exit $retval
+    fi
+else
+    info "OpenStack credentials file given to the docker and stored in ${FUNCTEST_CONF_DIR}/openstack.creds."
 fi
-
-
 # Source credentials
 source ${FUNCTEST_CONF_DIR}/openstack.creds