summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-01-13 11:14:58 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2016-01-13 10:26:59 +0000
commit16f12b8a76a804af86a4d048cfeeb44596dfb224 (patch)
treea739563870e9b8ae7fa159d66420ccb463a97a0c /docker
parentd18249570758b2376bb57e092c7ecf8f52ba8f46 (diff)
Remove references to foreman installer.
Foreman is not longer supported, the only INSTALLER_TYPE values are: fuel|apex|joid|compass Change-Id: I3c86335d16cdcab4796892a769189fcc4e7457db Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com> (cherry picked from commit 0f9250f654be1e2ced4b6d640ec13e7e78db39ee)
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile2
-rwxr-xr-xdocker/prepare_env.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6ae06e235..a39775c81 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -10,7 +10,7 @@
#
# Execution:
# $ docker run -t -i \
-# -e "INSTALLER_TYPE=fuel/foreman" \
+# -e "INSTALLER_TYPE=fuel|apex|compass|joid \
# -e "INSTALLER_IP=10.20.0.2/172.30.10.73" \
# -v $(pwd)/config_functest.yaml:/home/opnfv/functest/conf/config_functest.yaml
# opnfv/functest /bin/bash
diff --git a/docker/prepare_env.sh b/docker/prepare_env.sh
index 1db7be382..a56c580bb 100755
--- a/docker/prepare_env.sh
+++ b/docker/prepare_env.sh
@@ -57,7 +57,7 @@ else
fi
# definition of available installer names
-INSTALLERS=(fuel foreman compass apex joid)
+INSTALLERS=(fuel compass apex joid)
if [ ! -f ${FUNCTEST_CONF_DIR}/openstack.creds ]; then
# If credentials file is not given, check if environment variables are set