diff options
3 files changed, 1 insertions, 115 deletions
diff --git a/patches/opnfv-fuel/0010-deployment.py-stdout-not-consumed-when-deploying-cha.patch b/patches/opnfv-fuel/0010-deployment.py-stdout-not-consumed-when-deploying-cha.patch deleted file mode 100644 index 584413ec..00000000 --- a/patches/opnfv-fuel/0010-deployment.py-stdout-not-consumed-when-deploying-cha.patch +++ /dev/null @@ -1,66 +0,0 @@ -From: Josep Puigdemont <josep.puigdemont@enea.com> -Date: Wed, 4 May 2016 14:27:23 +0200 -Subject: [PATCH] deployment.py: stdout not consumed when deploying changes - -During the automatic deployment, when the environment is ready to be -deployed, the deploy.py script will spawn a shell process that will -perform the command "fuel deploy-changes". The standard output of this -process is then piped to a "tee" process, which redirects the output -to the standard output of the shell process, and to a file named -cloud.log. The file is monitored by the deploy script to find out the -status of the deployment, and print it to the log file of the automatic -deployment script, including percentages for each node being -provisioned. However, the deploy script never consumes the standard -output of the shell process. If the shell process produces enough -output, its standard output buffer will fill up, thus making the tee -process block trying to write to its standard output, and the cloud.log -file will not be updated. At this point, the deploy process, which is -monitoring cloud.log, will not detect any progress in the deployment, -and eventually it will time out and assume the deployment failed, -although it might have finished fine after that. - -The solution here is to remove the "tee" process from the shell command, -and instead redirect standard output to the cloud.log file. -Another solution would be to actually parse the standard output of the -shell command from the deploy script itself, but that would require a -bit more work, as reading a line at a time might block the script. - -Finally, with this patch the cloud.log file won't be deleted unless the -shell process has already finished. - -Change-Id: I03a77be42d220b1606e48fc4ca35e22d73a6e583 -Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> ---- - deploy/cloud/deployment.py | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/deploy/cloud/deployment.py b/deploy/cloud/deployment.py -index 306abf0..0127d2a 100644 ---- a/deploy/cloud/deployment.py -+++ b/deploy/cloud/deployment.py -@@ -101,8 +101,8 @@ class Deployment(object): - LOG_FILE = 'cloud.log' - - log('Starting deployment of environment %s' % self.env_id) -- run_proc('fuel --env %s deploy-changes | strings | tee %s' -- % (self.env_id, LOG_FILE)) -+ p = run_proc('fuel --env %s deploy-changes | strings > %s' -+ % (self.env_id, LOG_FILE)) - - ready = False - for i in range(int(self.deploy_timeout)): -@@ -119,7 +119,13 @@ class Deployment(object): - break - else: - time.sleep(SLEEP_TIME) -- delete(LOG_FILE) -+ -+ p.poll() -+ if p.returncode == None: -+ log('The process deploying the changes has not yet finished.') -+ log('''The file %s won't be deleted''' % LOG_FILE) -+ else: -+ delete(LOG_FILE) - - if ready: - log('Environment %s successfully deployed' % self.env_id) 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 <josep.puigdemont@enea.com> -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 <josep.puigdemont@enea.com> ---- - 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) diff --git a/patches/opnfv-fuel/0023-deploy.py-add-multiple-bridges-support.patch b/patches/opnfv-fuel/0023-deploy.py-add-multiple-bridges-support.patch index 376a7221..37a888b4 100644 --- a/patches/opnfv-fuel/0023-deploy.py-add-multiple-bridges-support.patch +++ b/patches/opnfv-fuel/0023-deploy.py-add-multiple-bridges-support.patch @@ -43,8 +43,7 @@ index ff4582a..041ba2f 100755 check_file_exists(args.dha_file) if not args.cleanup_only: -@@ -343,7 +346,8 @@ def parse_arguments(): - check_file_exists(args.iso_file) +@@ -343,6 +346,7 @@ def parse_arguments(): log('Using image directory: %s' % args.storage_dir) create_dir_if_not_exists(args.storage_dir) - check_bridge(args.pxe_bridge, args.dha_file) |