feat: Support Openstack Server Groups affinity (#2223)

Co-authored-by: Geoff Robertson <robertson.gg@gmail.com>
Co-authored-by: Matt Trachier <matt.trachier@suse.com>

Author: 3 people

docs/resources/machine_config_v2.md

@@ -279,6 +279,8 @@ The following attributes are exported:
 * `password` - (Optional/Sensitive) OpenStack password. Mandatory on Rancher v2.0.x and v2.1.x. Use `rancher2_cloud_credential` from Rancher v2.2.x (string)
 * `private_key_file` - (Optional/Sensitive) Private key content to use for SSH (string)
 * `sec_groups` - (Optional) OpenStack comma separated security groups for the machine (string)
+* `server_group_id` - (Optional) OpenStack server group id to use for the instance (string)
+* `server_group_name` - (Optional) OpenStack server group name to use for the instance (string)
 * `ssh_port` - (Optional) OpenStack SSH port * Default `22` (string)
 * `ssh_user` - (Optional) OpenStack SSH user * Default: `root` (string)
 * `tenant_id` - (Required++) OpenStack tenant id. Conflicts with `tenant_name` (string)

docs/resources/node_template.md

@@ -392,6 +392,8 @@ The following attributes are exported:
 * `password` - (Optional/Sensitive) OpenStack password. Mandatory on Rancher v2.0.x and v2.1.x. Use `rancher2_cloud_credential` from Rancher v2.2.x (string)
 * `private_key_file` - (Optional/Sensitive) Private key content to use for SSH (string)
 * `sec_groups` - (Optional) OpenStack comma separated security groups for the machine (string)
+* `server_group_id` - (Optional) OpenStack server group id to use for the instance (string)
+* `server_group_name` - (Optional) OpenStack server group name to use for the instance (string)
 * `ssh_port` - (Optional) OpenStack SSH port * Default `22` (string)
 * `ssh_user` - (Optional) OpenStack SSH user * Default: `root` (string)
 * `tenant_id` - (Required**) OpenStack tenant id. Conflicts with `tenant_name` (string)

rancher2/schema_machine_config_v2_openstack.go

@@ -111,6 +111,14 @@ func machineConfigV2OpenstackFields() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Optional: true,
 		},
+		"server_group_id": {
+			Type:     schema.TypeString,
+			Optional: true,
+		},
+		"server_group_name": {
+			Type:     schema.TypeString,
+			Optional: true,
+		},
 		"ssh_port": {
 			Type:     schema.TypeString,
 			Optional: true,

rancher2/structure_machine_config_v2_openstack.go

@@ -40,6 +40,8 @@ type machineConfigV2Openstack struct {
 	PrivateKeyFile              string `json:"privateKeyFile,omitempty" yaml:"privateKeyFile,omitempty"`
 	Region                      string `json:"region,omitempty" yaml:"region,omitempty"`
 	SecGroups                   string `json:"secGroups,omitempty" yaml:"secGroups,omitempty"`
+	ServerGroupID               string `json:"serverGroupId,omitempty" yaml:"serverGroupId,omitempty"`
+	ServerGroupName             string `json:"serverGroupName,omitempty" yaml:"serverGroupName,omitempty"`
 	SSHPort                     string `json:"sshPort,omitempty" yaml:"sshPort,omitempty"`
 	SSHUser                     string `json:"sshUser,omitempty" yaml:"sshUser,omitempty"`
 	TenantID                    string `json:"tenantId,omitempty" yaml:"tenantId,omitempty"`
@@ -98,6 +100,8 @@ func flattenMachineConfigV2Openstack(in *MachineConfigV2Openstack) []interface{}
 	obj["private_key_file"] = in.PrivateKeyFile
 	obj["region"] = in.Region
 	obj["sec_groups"] = in.SecGroups
+	obj["server_group_name"] = in.ServerGroupName
+	obj["server_group_id"] = in.ServerGroupID
 	obj["ssh_port"] = in.SSHPort
 	obj["ssh_user"] = in.SSHUser
 	obj["tenant_id"] = in.TenantID
@@ -211,6 +215,12 @@ func expandMachineConfigV2Openstack(p []interface{}, source *MachineConfigV2) *M
 	if v, ok := in["sec_groups"].(string); ok && len(v) > 0 {
 		obj.SecGroups = v
 	}
+	if v, ok := in["server_group_id"].(string); ok && len(v) > 0 {
+		obj.ServerGroupID = v
+	}
+	if v, ok := in["server_group_name"].(string); ok && len(v) > 0 {
+		obj.ServerGroupName = v
+	}
 	if v, ok := in["ssh_port"].(string); ok && len(v) > 0 {
 		obj.SSHPort = v
 	}