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>

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6ae06e2..a39775c 100644 (file)
--- 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 1db7be3..a56c580 100755 (executable)
--- 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

diff --git a/testcases/functest_utils.py b/testcases/functest_utils.py
index 53f5706..6c0c498 100644 (file)
--- a/testcases/functest_utils.py
+++ b/testcases/functest_utils.py
@@ -606,7 +606,7 @@ def get_git_branch(repo_path):
 
 def get_installer_type(logger=None):
     """
-    Get installer type (fuel, foreman, apex, joid, compass)
+    Get installer type (fuel, apex, joid, compass)
     """
     try:
         installer = os.environ['INSTALLER_TYPE']