Merge pull request #761 from grycap/devel

Devel
grycap · Jan 16, 2019 · 21865a7 · 21865a7
2 parents fe7d54d + 0f39bba
commit 21865a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/IM/VirtualMachine.py b/IM/VirtualMachine.py
@@ -913,7 +913,7 @@ def get_ctxt_output(self, remote_dir, delete=False):
                     stdout += f.read() + "\n"
                 self.log_error(stdout)
                 msg += stdout
-            except:
+            except Exception:
                 self.log_exception("Error getting stdout and stderr to guess why the agent output is not there.")
         except Exception as ex:
             self.log_exception("Error getting contextualization agent output: " + remote_dir + '/ctxt_agent.out')

diff --git a/changelog b/changelog
@@ -471,3 +471,5 @@ IM 1.8.0:
     * Add support to MongoDB.
     * Fix error Unable to get cloud-init contextualization to work with GCE in 1.7.5 & above.
     * Enable to force OpenID auth.
+    * Do not stop ctxt process in all VMs in case of failure in a previous step.
+    * Fix error contextualization never ends if a VM is deleted during context step.