diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2016-01-13 11:14:58 +0100 |
|---|---|---|
| committer | jose.lausuch <jose.lausuch@ericsson.com> | 2016-01-13 11:18:07 +0100 |
| commit | 0f9250f654be1e2ced4b6d640ec13e7e78db39ee (patch) | |
| tree | a739563870e9b8ae7fa159d66420ccb463a97a0c | |
| parent | 870587bd57ed00fb1b172ee9848f7cdfb3d04270 (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>
| -rw-r--r-- | docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | docker/prepare_env.sh | 2 | ||||
| -rw-r--r-- | testcases/functest_utils.py | 2 |
3 files changed, 3 insertions, 3 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 diff --git a/testcases/functest_utils.py b/testcases/functest_utils.py index 53f5706c9..6c0c49832 100644 --- 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'] |