From 7236ccc7f9fcb9163562d88455c80339fa6efd58 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 29 Aug 2016 15:50:12 +0200
Subject: Upstream: Fuel@OPNFV pulled patches

Change-Id: Ic584d9b1eb179009256de8ccacfb7669976823c6
---
 .../0003-deploy.sh-accept-a-timeout-flag-T.patch   | 86 ----------------------
 1 file changed, 86 deletions(-)
 delete mode 100644 patches/opnfv-fuel/0003-deploy.sh-accept-a-timeout-flag-T.patch

(limited to 'patches/opnfv-fuel/0003-deploy.sh-accept-a-timeout-flag-T.patch')

diff --git a/patches/opnfv-fuel/0003-deploy.sh-accept-a-timeout-flag-T.patch b/patches/opnfv-fuel/0003-deploy.sh-accept-a-timeout-flag-T.patch
deleted file mode 100644
index 641891bb..00000000
--- a/patches/opnfv-fuel/0003-deploy.sh-accept-a-timeout-flag-T.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 0ca4dada5b3528c84f2edcb7f1a2df8f0a18779d Mon Sep 17 00:00:00 2001
-From: Josep Puigdemont <josep.puigdemont@enea.com>
-Date: Mon, 9 May 2016 11:05:58 +0200
-Subject: [PATCH] deploy.sh: accept a timeout flag (-T)
-
-Change-Id: I58a7b9bc639bb03b994ea34fc317f5679140d9fd
-Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
----
- ci/deploy.sh | 19 +++++++++++++++----
- 1 file changed, 15 insertions(+), 4 deletions(-)
-
-diff --git a/ci/deploy.sh b/ci/deploy.sh
-index 4e4586c..8411714 100755
---- a/ci/deploy.sh
-+++ b/ci/deploy.sh
-@@ -29,7 +29,7 @@ cat << EOF
- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
- `basename $0`: Deploys the Fuel@OPNFV stack
- 
--usage: `basename $0` -b base-uri [-B PXE Bridge] [-f] [-F] [-H] -l lab-name -p pod-name -s deploy-scenario [-S image-dir] -i iso
-+usage: `basename $0` -b base-uri [-B PXE Bridge] [-f] [-F] [-H] -l lab-name -p pod-name -s deploy-scenario [-S image-dir] [-T timeout] -i iso
-        -s deployment-scenario [-S optional Deploy-scenario path URI]
-        [-R optional local relen repo (containing deployment Scenarios]
- 
-@@ -47,6 +47,7 @@ OPTIONS:
-   -p  Pod-name
-   -s  Deploy-scenario short-name/base-file-name
-   -S  Storage dir for VM images
-+  -T  Timeout, in minutes, for the deploy.
-   -i  iso url
- 
- Description:
-@@ -78,6 +79,8 @@ Input parameters to the build script is:
-    or a deployment short-name as defined by scenario.yaml in the deployment
-    scenario path.
- -S Storage dir for VM images, default is fuel/deploy/images
-+-T Timeout, in minutes, for the deploy. It defaults to using the DEPLOY_TIMEOUT
-+   environment variable when defined, or to the default in deploy.py otherwise
- -i .iso image to be deployed (needs to be provided in a URI
-    style, it can be a local resource: file:// or a remote resource http(s)://)
- 
-@@ -116,6 +119,11 @@ FUEL_CREATION_ONLY=''
- NO_DEPLOY_ENVIRONMENT=''
- STORAGE_DIR=''
- DRY_RUN=0
-+if ! [ -z $DEPLOY_TIMEOUT ]; then
-+    DEPLOY_TIMEOUT="-dt $DEPLOY_TIMEOUT"
-+else
-+    DEPLOY_TIMEOUT=""
-+fi
- #
- # END of variables to customize
- ############################################################################
-@@ -123,7 +131,7 @@ DRY_RUN=0
- ############################################################################
- # BEGIN of main
- #
--while getopts "b:B:dfFHl:L:p:s:S:i:he" OPTION
-+while getopts "b:B:dfFHl:L:p:s:S:T:i:he" OPTION
- do
-     case $OPTION in
-         b)
-@@ -174,6 +182,9 @@ do
-                 STORAGE_DIR="-s ${OPTARG}"
-             fi
-             ;;
-+        T)
-+            DEPLOY_TIMEOUT="-dt ${OPTARG}"
-+            ;;
-         i)
-             ISO=${OPTARG}
-             if [[ ! $ISO == file://* ]] && \
-@@ -243,8 +254,8 @@ if [ $DRY_RUN -eq 0 ]; then
-         ISO=${SCRIPT_PATH}/ISO/image.iso
-     fi
-     # Start deployment
--    echo "python deploy.py $DEPLOY_LOG $STORAGE_DIR $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO"
--    python deploy.py $DEPLOY_LOG $STORAGE_DIR $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO
-+    echo "python deploy.py $DEPLOY_LOG $STORAGE_DIR $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO $DEPLOY_TIMEOUT"
-+    python deploy.py $DEPLOY_LOG $STORAGE_DIR $PXE_BRIDGE $USE_EXISTING_FUEL $FUEL_CREATION_ONLY $NO_HEALTH_CHECK $NO_DEPLOY_ENVIRONMENT -dea ${SCRIPT_PATH}/config/dea.yaml -dha ${SCRIPT_PATH}/config/dha.yaml -iso $ISO $DEPLOY_TIMEOUT
- fi
- popd > /dev/null
- 
--- 
-2.5.5
-
-- 
cgit 1.2.3-korg