openstack/shade
Code Issues Proposed changes

Merge "Remove another extraneous get for create_server"

Browse Source
This commit is contained in:
Jenkins
2015-11-05 17:22:48 +00:00
committed by Gerrit Code Review
parent 9c0467bdde d68e819fd7
commit 2ffbd8a946
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
shade/openstackcloud.py
View File

@@ -3251,19 +3251,25 @@ class OpenStackCloud(object):
try:
server = self.manager.submitTask(_tasks.ServerCreate(
name=name, image=image, flavor=flavor, **kwargs))
# This is a direct get task call to skip the list_servers
# cache which has absolutely no chance of containing the
# new server
server = self.get_server_by_id(server.id)
server_id = server['id']
server_id = server.id
if not wait:
# This is a direct get task call to skip the list_servers
# cache which has absolutely no chance of containing the
# new server
# Only do this if we're not going to wait for the server
# to complete booting, because the only reason we do it
# is to get a server record that is the return value from
# get/list rather than the return value of create. If we're
# going to do the wait loop below, this is a waste of a call
server = self.get_server_by_id(server.id)
if server.status == 'ERROR':
raise OpenStackCloudException(
"Error in creating the server.")
except OpenStackCloudException:
raise
except Exception as e:
raise OpenStackCloudException(
"Error in creating instance: {0}".format(e))
if server.status == 'ERROR':
raise OpenStackCloudException(
"Error in creating the server.")
if wait:
# There is no point in iterating faster than the list_servers cache
for count in _utils._iterate_timeout(