aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch
diff options
context:
space:
mode:
authorJosep Puigdemont <josep.puigdemont@enea.com>2016-05-08 13:04:07 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-08 17:34:50 +0000
commita31faaebf959dca2793edd984f6776ae5c272f4f (patch)
treed09bf3d730b109339363c326dc96dfd187b037f9 /patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch
parent1158f729444aa16313e263b468e92555f8eb7eb4 (diff)
ARMband patches for the fuel@opnfv deploy scripts
These are a collection of patches that adapt the current Fuel deploy scripts for mainly two purposes: - Make it possible to create a Fuel VM on a remote libvirt server. We use the LIBVIRT_DEFAULT_URI environment variable to detect that. Local deploys are possible by setting this variable to 'quemu:///system', or leaving it empty. See: https://libvirt.org/remote.html for more details. - Make it possible to add additional network interfaces. For this we allow the user to pass the "-b bridge" paramter several times, and creating a new virtual NIC for each of them, in the same order they were given. This required a bit of refactoring of the code. None of the changes above should break backwards compatibility, except when indicated in the commit (search for CHANGE in the log) In addition there are some updates to the code that were deemed necessary, like the ability to retry when executing shell commands instead of directly failing, and a simplification of the DHA IPMI adapter. Change-Id: I8a0cd5b8672383decd861309328137971eaed14b Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> (cherry picked from commit bedeb36ac9ad42fb1ead2449ed8e75f0171808a2)
Diffstat (limited to 'patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch')
-rw-r--r--patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch b/patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch
new file mode 100644
index 00000000..918a1192
--- /dev/null
+++ b/patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch
@@ -0,0 +1,40 @@
+From: Josep Puigdemont <josep.puigdemont@enea.com>
+Date: Wed, 4 May 2016 14:27:23 +0200
+Subject: [PATCH] common.py: catch stderr in exec_cmd
+
+Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
+---
+ deploy/common.py | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/deploy/common.py b/deploy/common.py
+index 787a21a..41b4e27 100644
+--- a/deploy/common.py
++++ b/deploy/common.py
+@@ -38,20 +38,20 @@ LOG.addHandler(out_handler)
+ os.chmod(LOGFILE, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
+
+ def exec_cmd(cmd, check=True):
+- nul_f = open(os.devnull, 'w')
+ process = subprocess.Popen(cmd,
+ stdout=subprocess.PIPE,
+- stderr=nul_f,
++ stderr=subprocess.PIPE,
+ shell=True)
+- nul_f.close()
+- response = process.communicate()[0].strip()
++ (response, stderr) = process.communicate()
+ return_code = process.returncode
++ response = response.strip()
+ if check:
+ if return_code > 0:
++ stderr = stderr.strip()
+ print "Failed command: " + str(cmd)
+- print "Command returned response: " + str(response)
++ print "Command returned response: " + str(stderr)
+ print "Command return code: " + str(return_code)
+- raise Exception(response)
++ raise Exception(stderr)
+ else:
+ print "Command: " + str(cmd)
+ print str(response)