From fd9c2b57299d92c6092a966a79cdf480f523c92b Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Wed, 11 Oct 2017 12:09:56 -0500
Subject: [PATCH] Add group parameter to create_server

Server groups are a user-facing feature and can be requested via
scheduler hints. While that already exists it's not the world's cleanest
user interface, so add a specific parameter which will set the right
thing into the scheduler hints dict.

Change-Id: Idb28779ed1fde341acab2116b510fce349f74b50
---
 ...boot-on-server-group-a80e51850db24b3d.yaml |  4 ++++
 shade/openstackcloud.py                       | 20 ++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/boot-on-server-group-a80e51850db24b3d.yaml

diff --git a/releasenotes/notes/boot-on-server-group-a80e51850db24b3d.yaml b/releasenotes/notes/boot-on-server-group-a80e51850db24b3d.yaml
new file mode 100644
index 000000000..4f4a39c23
--- /dev/null
+++ b/releasenotes/notes/boot-on-server-group-a80e51850db24b3d.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - Added ``group`` parameter to create_server to allow
+    booting a server into a specific server group.
diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py
index ab4bcd28b..806713c28 100644
--- a/shade/openstackcloud.py
+++ b/shade/openstackcloud.py
@@ -6390,6 +6390,7 @@ class OpenStackCloud(
             wait=False, timeout=180, reuse_ips=True,
             network=None, boot_from_volume=False, volume_size='50',
             boot_volume=None, volumes=None, nat_destination=None,
+            group=None,
             **kwargs):
         """Create a virtual server instance.
 
@@ -6468,6 +6469,10 @@ class OpenStackCloud(
                                 be attached to, if it's not possible to
                                 infer from the cloud's configuration.
                                 (Optional, defaults to None)
+        :param group: ServerGroup dict, name or id to boot the server in.
+                      If a group is provided in both scheduler_hints and in
+                      the group param, the group param will win.
+                      (Optional, defaults to None)
         :returns: A ``munch.Munch`` representing the created server.
         :raises: OpenStackCloudException on operation error.
         """
@@ -6477,15 +6482,14 @@ class OpenStackCloud(
             security_groups = [security_groups]
         if security_groups:
             kwargs['security_groups'] = []
-            for group in security_groups:
-                kwargs['security_groups'].append(dict(name=group))
+            for sec_group in security_groups:
+                kwargs['security_groups'].append(dict(name=sec_group))
         if 'userdata' in kwargs:
             user_data = kwargs.pop('userdata')
             if user_data:
                 kwargs['user_data'] = self._encode_server_userdata(user_data)
         for (desired, given) in (
                 ('OS-DCF:diskConfig', 'disk_config'),
-                ('os:scheduler_hints', 'scheduler_hints'),
                 ('config_drive', 'config_drive'),
                 ('key_name', 'key_name'),
                 ('metadata', 'meta'),
@@ -6494,6 +6498,16 @@ class OpenStackCloud(
             if value:
                 kwargs[desired] = value
 
+        hints = kwargs.pop('scheduler_hints', {})
+        if group:
+            group_obj = self.get_server_group(group)
+            if not group_obj:
+                raise OpenStackCloudException(
+                    "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))