From 94a633e638eac49cd2401ebfc0efb1543892528a Mon Sep 17 00:00:00 2001
From: Max Bridges <mbridges@redhat.com>
Date: Mon, 28 Sep 2020 16:50:48 -0400
Subject: [PATCH 1/3] Add MachineSet infra and server group content

---
 machine_management/creating-infrastructure-machinesets.adoc | 2 ++
 modules/machineset-yaml-osp.adoc                            | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/machine_management/creating-infrastructure-machinesets.adoc b/machine_management/creating-infrastructure-machinesets.adoc
index 73be6edd684d..e0471c43b2a6 100644
--- a/machine_management/creating-infrastructure-machinesets.adoc
+++ b/machine_management/creating-infrastructure-machinesets.adoc
@@ -46,6 +46,8 @@ include::modules/machineset-yaml-azure.adoc[leveloffset=+3]
 
 include::modules/machineset-yaml-gcp.adoc[leveloffset=+3]
 
+include::modules/machineset-yaml-ocp.adoc[leveloffset=+3]
+
 include::modules/machineset-creating.adoc[leveloffset=+2]
 
 [id="moving-resources-to-infrastructure-machinesets"]
diff --git a/modules/machineset-yaml-osp.adoc b/modules/machineset-yaml-osp.adoc
index fa6d5573ea9b..109d48be415f 100644
--- a/modules/machineset-yaml-osp.adoc
+++ b/modules/machineset-yaml-osp.adoc
@@ -48,6 +48,7 @@ spec:
             namespace: openshift-machine-api
           flavor: <nova_flavor>
           image: <glance_image_name_or_location>
+          serverGroupID: <optional_UUID_of_server_group> <4>
           kind: OpenstackProviderSpec
           networks:
           - filter: {}
@@ -78,3 +79,4 @@ $ oc get -o jsonpath='{.status.infrastructureName}{"\n"}' infrastructure cluster
 ----
 <2> Specify the node label to add.
 <3> Specify the infrastructure ID and node label.
+<4> Enter the value that is returned when link:https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/16.0/html/command_line_interface_reference/server#server_group_create[creating a server group]. The server group must have `anti-affinity` or `soft-anti-affinity` policies.
\ No newline at end of file

From 83aef7895bc2af20733be288f58e9ae5f8a659ff Mon Sep 17 00:00:00 2001
From: Max Bridges <mbridges@redhat.com>
Date: Tue, 29 Sep 2020 09:48:03 -0400
Subject: [PATCH 2/3] Feedback tweak

---
 modules/machineset-yaml-osp.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/machineset-yaml-osp.adoc b/modules/machineset-yaml-osp.adoc
index 109d48be415f..aa28775ec7f3 100644
--- a/modules/machineset-yaml-osp.adoc
+++ b/modules/machineset-yaml-osp.adoc
@@ -79,4 +79,5 @@ $ oc get -o jsonpath='{.status.infrastructureName}{"\n"}' infrastructure cluster
 ----
 <2> Specify the node label to add.
 <3> Specify the infrastructure ID and node label.
-<4> Enter the value that is returned when link:https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/16.0/html/command_line_interface_reference/server#server_group_create[creating a server group]. The server group must have `anti-affinity` or `soft-anti-affinity` policies.
\ No newline at end of file
+<4> To set a server group policy for the MachineSet, enter the value that is returned from
+link:https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/16.0/html/command_line_interface_reference/server#server_group_create[creating a server group].
\ No newline at end of file

From 88389670b79e09b36add50dd037350176dac3cee Mon Sep 17 00:00:00 2001
From: Max Bridges <50179998+maxwelldb@users.noreply.github.com>
Date: Tue, 29 Sep 2020 19:39:29 -0400
Subject: [PATCH 3/3] Add recommended policies

---
 modules/machineset-yaml-osp.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/machineset-yaml-osp.adoc b/modules/machineset-yaml-osp.adoc
index aa28775ec7f3..ebda6525eafc 100644
--- a/modules/machineset-yaml-osp.adoc
+++ b/modules/machineset-yaml-osp.adoc
@@ -80,4 +80,4 @@ $ oc get -o jsonpath='{.status.infrastructureName}{"\n"}' infrastructure cluster
 <2> Specify the node label to add.
 <3> Specify the infrastructure ID and node label.
 <4> To set a server group policy for the MachineSet, enter the value that is returned from
-link:https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/16.0/html/command_line_interface_reference/server#server_group_create[creating a server group].
\ No newline at end of file
+link:https://access.redhat.com/documentation/en-us/red_hat_openstack_platform/16.0/html/command_line_interface_reference/server#server_group_create[creating a server group]. For most deployments, `anti-affinity` or `soft-anti-affinity` policies are recommended.