From 2131e2aa5fedf4ebeecf1e719054061e950b4e92 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 13 May 2016 17:51:20 +0200 Subject: Rebase: p/opnfv-fuel: Drop upstream patches. While we're at it, fix minor context in remaining patch. --- ...deploy.sh-do-not-expect-a-parameter-for-h.patch | 47 ---------------------- 1 file changed, 47 deletions(-) delete mode 100644 patches/opnfv-fuel/0012-deploy.sh-do-not-expect-a-parameter-for-h.patch (limited to 'patches/opnfv-fuel/0012-deploy.sh-do-not-expect-a-parameter-for-h.patch') diff --git a/patches/opnfv-fuel/0012-deploy.sh-do-not-expect-a-parameter-for-h.patch b/patches/opnfv-fuel/0012-deploy.sh-do-not-expect-a-parameter-for-h.patch deleted file mode 100644 index f515aab6..00000000 --- a/patches/opnfv-fuel/0012-deploy.sh-do-not-expect-a-parameter-for-h.patch +++ /dev/null @@ -1,47 +0,0 @@ -From: Josep Puigdemont -Date: Wed, 4 May 2016 14:27:23 +0200 -Subject: [PATCH] deploy.sh: do not expect a parameter for -h - -If -h was given as a parameter to the script, it would report an error -as it expected a parameter, and if it was called as the only parameter, -it would run deploy.py as if "old style" parameters had been given, thus -showing the usage for the python script, instead of the expected usage -message for this script. - -Update the usage message to include -h. - -Change-Id: I0930936962c1cb479ec4409ff114cd60a386b276 -Signed-off-by: Josep Puigdemont ---- - ci/deploy.sh | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/ci/deploy.sh b/ci/deploy.sh -index d83bba2..dc13f1c 100755 ---- a/ci/deploy.sh -+++ b/ci/deploy.sh -@@ -40,6 +40,7 @@ OPTIONS: - -f Deploy on existing Fuel master - -e Do not launch environment deployment - -F Do only create a Fuel master -+ -h Print this message and exit - -H No health check - -l Lab-name - -p Pod-name -@@ -62,6 +63,7 @@ Input parameters to the build script is: - -f Deploy on existing Fuel master - -e Do not launch environment deployment - -F Do only create a Fuel master -+-h Print this message and exit - -H Do not run fuel built in health-check after successfull deployment - -l Lab name as defined in the configuration directory, e.g. lf - -p POD name as defined in the configuration directory, e.g. pod-1 -@@ -116,7 +118,7 @@ DRY_RUN=0 - ############################################################################ - # BEGIN of main - # --while getopts "b:B:dfFHl:p:s:S:i:h:e" OPTION -+while getopts "b:B:dfFHl:p:s:S:i:he" OPTION - do - case $OPTION in - b) -- cgit 1.2.3-korg