openstack
/
heat
Code Issues Proposed changes

Merge "Reorder the update task for nova server resource" into stable/ocata

This commit is contained in:
Jenkins 2017-08-17 08:12:44 +00:00 committed by Gerrit Code Review
parent aad09c9c67 c36300ec96
commit 10089583ec
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
heat/engine/resources/openstack/nova/server.py
View File

@ -1211,6 +1211,14 @@ class Server(server_base.BaseServer, sh.SchedulerHintsMixin,
if self.TAGS in prop_diff:
self._update_server_tags(after_props[self.TAGS] or [])
if self.NAME in prop_diff:
if not server:
server = self.client_plugin().get_server(self.resource_id)
self.client_plugin().rename(server, after_props[self.NAME])
if self.NETWORKS in prop_diff:
updaters.extend(self._update_networks(server, after_props))
if self.FLAVOR in prop_diff:
updaters.extend(self._update_flavor(after_props))
@ -1221,14 +1229,6 @@ class Server(server_base.BaseServer, sh.SchedulerHintsMixin,
server = self.client_plugin().get_server(self.resource_id)
server.change_password(after_props[self.ADMIN_PASS])
if self.NAME in prop_diff:
if not server:
server = self.client_plugin().get_server(self.resource_id)
self.client_plugin().rename(server, after_props[self.NAME])
if self.NETWORKS in prop_diff:
updaters.extend(self._update_networks(server, after_props))
# NOTE(pas-ha) optimization is possible (starting first task
# right away), but we'd rather not, as this method already might
# have called several APIs