openstack
/
trove
Code Issues Proposed changes

Merge "Fix delete instance" into stable/train

This commit is contained in:
Zuul 2019-12-22 14:07:09 +00:00 committed by Gerrit Code Review
parent 47605e6c13 3e7b8cf83a
commit 7680b5ef0e
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/plugin.sh
View File

@ -555,7 +555,7 @@ function config_trove_network {
sudo ip route
# Now make sure the conf settings are right
iniset $TROVE_CONF DEFAULT network_label_regex ${PRIVATE_NETWORK_NAME}
iniset $TROVE_CONF DEFAULT network_label_regex ""
iniset $TROVE_CONF DEFAULT ip_regex ""
iniset $TROVE_CONF DEFAULT black_list_regex ""
iniset $TROVE_CONF DEFAULT management_networks ${mgmt_net_id}

20
trove/taskmanager/models.py
View File

@ -433,20 +433,22 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin):
TroveInstanceCreate(instance=self,
instance_size=flavor['ram']).notify()
except (TroveError, PollTimeOut) as ex:
LOG.exception("Failed to create instance %s.", self.id)
LOG.error("Failed to create instance %s, error: %s.",
self.id, str(ex))
self.update_statuses_on_time_out()
error_message = "%s" % ex
error_details = traceback.format_exc()
except Exception as ex:
LOG.exception("Failed to send usage create-event for "
"instance %s.", self.id)
LOG.error("Failed to send usage create-event for instance %s, "
"error: %s", self.id, str(ex))
error_message = "%s" % ex
error_details = traceback.format_exc()
finally:
if error_message:
inst_models.save_instance_fault(
self.id, error_message, error_details,
skip_delta=CONF.usage_sleep_time + 1)
skip_delta=CONF.usage_sleep_time + 1
)
def _create_port(self, network, security_groups, is_mgmt=False,
is_public=False):
@ -774,7 +776,15 @@ class FreshInstanceTasks(FreshInstance, NotifyMixin, ConfigurationMixin):
raise TroveError(_("Service not active, status: %s") % status)
c_id = self.db_info.compute_instance_id
server = self.nova_client.servers.get(c_id)
try:
server = self.nova_client.servers.get(c_id)
except Exception as e:
raise TroveError(
_("Failed to get server %(server)s for instance %(instance)s, "
"error: %(error)s"),
server=c_id, instance=self.id, error=str(e)
)
server_status = server.status
LOG.debug("Server status of instance %s is %s", self.id, server_status)
if server_status in [InstanceStatus.ERROR,