diff options
| -rw-r--r-- | deploy/common.py | 12 | ||||
| -rw-r--r-- | deploy/config/dea_base.yaml | 2 | ||||
| -rw-r--r-- | deploy/deploy.py | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/deploy/common.py b/deploy/common.py index 787a21a1d..41b4e274e 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) diff --git a/deploy/config/dea_base.yaml b/deploy/config/dea_base.yaml index 1a34d819a..15e3cb9d8 100644 --- a/deploy/config/dea_base.yaml +++ b/deploy/config/dea_base.yaml @@ -19,7 +19,7 @@ fuel: FUEL_ACCESS: password: admin user: admin -wanted_release: Liberty on Ubuntu 14.04 +wanted_release: Mitaka on Ubuntu 14.04 settings: editable: access: diff --git a/deploy/deploy.py b/deploy/deploy.py index 0d406412c..742e76baa 100644 --- a/deploy/deploy.py +++ b/deploy/deploy.py @@ -165,6 +165,8 @@ class AutoDeploy(object): '-x "lost+found:" -V %s -o %s .' % (iso_linux_bin, iso_label, new_iso)) + delete(tmp_new_dir) + def update_fuel_isolinux(self, file): with io.open(file) as f: data = f.read() |