From 5ee854bd0e03bf1ffeba89d5ba93a9e7d581138b Mon Sep 17 00:00:00 2001 From: Christian Groschupp Date: Tue, 14 Nov 2017 18:19:38 +0100 Subject: [PATCH] Fix creating a server with specifying scheduler_hints Change-Id: I183571547f88ef5647399448b0a2bb2614cff113 Story: 2001174 Task: 4909 --- shade/openstackcloud.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py index ef65bfa48..42efc5533 100644 --- a/shade/openstackcloud.py +++ b/shade/openstackcloud.py @@ -6575,8 +6575,6 @@ class OpenStackCloud( "Server Group {group} was requested but was not found" " on the cloud".format(group=group)) hints['group'] = group_obj['id'] - if hints: - kwargs['os:scheduler_hints'] = hints kwargs.setdefault('max_count', kwargs.get('max_count', 1)) kwargs.setdefault('min_count', kwargs.get('min_count', 1)) @@ -6672,8 +6670,11 @@ class OpenStackCloud( if 'block_device_mapping_v2' in kwargs: endpoint = '/os-volumes_boot' 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( - endpoint, json={'server': kwargs}) + endpoint, json=server_json) server = self._get_and_munchify('server', data) admin_pass = server.get('adminPass') or kwargs.get('admin_pass') if not wait: