openstack/shade
Code Issues Proposed changes

Merge "Fix creating a server with specifying scheduler_hints"

Browse Source
This commit is contained in:
Zuul 2017-11-15 20:56:01 +00:00 committed by Gerrit Code Review
commit cb79152f50
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shade/openstackcloud.py
View File

@ -6690,8 +6690,6 @@ class OpenStackCloud(
"Server Group {group} was requested but was not found" "Server Group {group} was requested but was not found"
" on the cloud".format(group=group)) " on the cloud".format(group=group))
hints['group'] = group_obj['id'] hints['group'] = group_obj['id']
if hints:
kwargs['os:scheduler_hints'] = hints
kwargs.setdefault('max_count', kwargs.get('max_count', 1)) kwargs.setdefault('max_count', kwargs.get('max_count', 1))
kwargs.setdefault('min_count', kwargs.get('min_count', 1)) kwargs.setdefault('min_count', kwargs.get('min_count', 1))
@ -6787,8 +6785,11 @@ class OpenStackCloud(
if 'block_device_mapping_v2' in kwargs: if 'block_device_mapping_v2' in kwargs:
endpoint = '/os-volumes_boot' endpoint = '/os-volumes_boot'
with _utils.shade_exceptions("Error in creating instance"): with _utils.shade_exceptions("Error in creating instance"):
server_json = {'server': kwargs}
if hints:
server_json['os:scheduler_hints'] = hints
data = self._compute_client.post( data = self._compute_client.post(
endpoint, json={'server': kwargs}) endpoint, json=server_json)
server = self._get_and_munchify('server', data) server = self._get_and_munchify('server', data)
admin_pass = server.get('adminPass') or kwargs.get('admin_pass') admin_pass = server.get('adminPass') or kwargs.get('admin_pass')
if not wait: if not wait: