x
/
inception
Code Issues Proposed changes

Merge "Add re-raise argument to start() and cleanup()"

This commit is contained in:
Jenkins 2013-09-19 02:07:11 +00:00 committed by Gerrit Code Review
parent e19ee84e50 e76ace1914
commit 9b4e8b08cf
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inception/orchestrator.py
View File

@ -243,9 +243,12 @@ class Orchestrator(object):
self._worker_names = [] self._worker_names = []
self._gateway_floating_ip = None self._gateway_floating_ip = None
def start(self): def start(self, re_raise=False):
""" """
run the whole process run the whole process
@param re_raise: whether re-raise caught exception, for the purpose of
notifying external caller. Default: False
""" """
try: try:
self._check_existence() self._check_existence()
@ -269,6 +272,8 @@ class Orchestrator(object):
LOGGER.info("Although there was error in creating your " LOGGER.info("Although there was error in creating your "
"inception cloud '%s', resources have been " "inception cloud '%s', resources have been "
"successfully cleaned up", self.prefix) "successfully cleaned up", self.prefix)
if re_raise:
raise
def _check_existence(self): def _check_existence(self):
""" """
@ -539,9 +544,12 @@ class Orchestrator(object):
self._add_run_list(self._worker_names, "role[os-worker-combined]") self._add_run_list(self._worker_names, "role[os-worker-combined]")
self._run_chef_client(self._worker_ips) self._run_chef_client(self._worker_ips)
def cleanup(self): def cleanup(self, re_raise=False):
""" """
Clean up the whole inception cloud, based on self.prefix Clean up the whole inception cloud, based on self.prefix
@param re_raise: whether re-raise caught exception, for the purpose of
notifying external caller. Default: False
""" """
LOGGER.info("Let's clean up inception cloud '%s'...", self.prefix) LOGGER.info("Let's clean up inception cloud '%s'...", self.prefix)
## find out servers info ## find out servers info
@ -568,6 +576,8 @@ class Orchestrator(object):
self.client.floating_ips.delete(floating_ip) self.client.floating_ips.delete(floating_ip)
except Exception: except Exception:
LOGGER.exception("Error in disassociating/releasing floating IP") LOGGER.exception("Error in disassociating/releasing floating IP")
if re_raise:
raise
## try deleting each server ## try deleting each server
for server in servers: for server in servers:
try: try:
@ -575,5 +585,7 @@ class Orchestrator(object):
server.delete() server.delete()
except Exception: except Exception:
LOGGER.exception("Error in deleting server %s", server) LOGGER.exception("Error in deleting server %s", server)
if re_raise:
raise
continue continue
LOGGER.info("Inception cloud '%s' has been cleaned up.", self.prefix) LOGGER.info("Inception cloud '%s' has been cleaned up.", self.prefix)