summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-03-31 09:55:44 -0400
committerDan Radez <dradez@redhat.com>2017-04-03 15:32:31 -0400
commit21c3c7fa27015fb727ce88cd5eb2821138f08283 (patch)
tree4bc2818bdc55768163e8046d93c7cb3a3b0748b4 /ci
parent418533f4c431a7435435e090a6a8415080556148 (diff)
Removing Deprecated ENV handling
Change-Id: I7010fb29bf6927d3d4050d9dd8326a0ec7bc44f1 Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/clean.sh13
-rwxr-xr-xci/deploy.sh13
-rwxr-xr-xci/util.sh13
3 files changed, 0 insertions, 39 deletions
diff --git a/ci/clean.sh b/ci/clean.sh
index 262e74b..4335b82 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -12,19 +12,6 @@
#author: Dan Radez (dradez@redhat.com)
#author: Tim Rozet (trozet@redhat.com)
-# Backwards compat for old ENV Vars
-# Remove in E Release
-if [ -n "$CONFIG" ]; then
- echo -e "${red}WARNING: ENV var CONFIG is Deprecated, please unset CONFIG and export BASE in its place${reset}"
- echo -e "${red}WARNING: CONFIG will be removed in E${reset}"
- BASE=$CONFIG
-fi
-if [ -n "$RESOURCES" ]; then
- echo -e "${red}WARNING: ENV var RESOURCES is Deprecated, please unset RESOURCES and export IMAGES in its place${reset}"
- echo -e "${red}WARNING: RESOURCES will be removed in E${reset}"
- IMAGES=$RESOURCES
-fi
-
# Use default if no param passed
BASE=${BASE:-'/var/opt/opnfv'}
IMAGES=${IMAGES:-"$BASE/images"}
diff --git a/ci/deploy.sh b/ci/deploy.sh
index a395598..dd03864 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -37,19 +37,6 @@ declare -A deploy_options_array
declare -a performance_options
declare -A NET_MAP
-# Backwards compat for old ENV Vars
-# Remove in E Release
-if [ -n "$CONFIG" ]; then
- echo -e "${red}WARNING: ENV var CONFIG is Deprecated, please unset CONFIG and export BASE in its place${reset}"
- echo -e "${red}WARNING: CONFIG will be removed in E${reset}"
- BASE=$CONFIG
-fi
-if [ -n "$RESOURCES" ]; then
- echo -e "${red}WARNING: ENV var RESOURCES is Deprecated, please unset RESOURCES and export IMAGES in its place${reset}"
- echo -e "${red}WARNING: RESOURCES will be removed in E${reset}"
- IMAGES=$RESOURCES
-fi
-
APEX_TMP_DIR=$(python3 -c "import tempfile; print(tempfile.mkdtemp())")
SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null -o LogLevel=error)
DEPLOY_OPTIONS=""
diff --git a/ci/util.sh b/ci/util.sh
index 34821a7..1a931d0 100755
--- a/ci/util.sh
+++ b/ci/util.sh
@@ -2,19 +2,6 @@
# Utility script used to interact with a deployment
# @author Tim Rozet (trozet@redhat.com)
-# Backwards compat for old ENV Vars
-# Remove in E Release
-if [ -n "$CONFIG" ]; then
- echo -e "${red}WARNING: ENV var CONFIG is Deprecated, please unset CONFIG and export BASE in its place${reset}"
- echo -e "${red}WARNING: CONFIG will be removed in E${reset}"
- BASE=$CONFIG
-fi
-if [ -n "$RESOURCES" ]; then
- echo -e "${red}WARNING: ENV var RESOURCES is Deprecated, please unset RESOURCES and export IMAGES in its place${reset}"
- echo -e "${red}WARNING: RESOURCES will be removed in E${reset}"
- IMAGES=$RESOURCES
-fi
-
BASE=${BASE:-'/var/opt/opnfv'}
IMAGES=${IMAGES:-"$BASE/images"}
LIB=${LIB:-"$BASE/lib"}