diff --git a/ibm/service/power/resource_ibm_pi_instance.go b/ibm/service/power/resource_ibm_pi_instance.go index 85ba08c71d..473ccce909 100644 --- a/ibm/service/power/resource_ibm_pi_instance.go +++ b/ibm/service/power/resource_ibm_pi_instance.go @@ -259,16 +259,14 @@ func ResourceIBMPIInstance() *schema.Resource { PISAPInstanceProfileID: { Type: schema.TypeString, Optional: true, - ConflictsWith: []string{helpers.PIInstanceProcessors, helpers.PIInstanceMemory, helpers.PIInstanceProcType, helpers.PIInstanceSystemType}, + ConflictsWith: []string{helpers.PIInstanceProcessors, helpers.PIInstanceMemory, helpers.PIInstanceProcType}, Description: "SAP Profile ID for the amount of cores and memory", }, helpers.PIInstanceSystemType: { - Type: schema.TypeString, - Optional: true, - Computed: true, - ValidateFunc: validate.ValidateAllowedStringValues([]string{"s922", "e880", "e980"}), - ConflictsWith: []string{PISAPInstanceProfileID}, - Description: "PI Instance system type", + Type: schema.TypeString, + Optional: true, + Computed: true, + Description: "PI Instance system type", }, helpers.PIInstanceReplicants: { Type: schema.TypeInt, @@ -1058,6 +1056,9 @@ func createSAPInstance(d *schema.ResourceData, sapClient *st.IBMPISAPInstanceCli } body.UserData = userData } + if sys, ok := d.GetOk(helpers.PIInstanceSystemType); ok { + body.SysType = sys.(string) + } if st, ok := d.GetOk(helpers.PIInstanceStorageType); ok { body.StorageType = st.(string) diff --git a/website/docs/r/pi_instance.html.markdown b/website/docs/r/pi_instance.html.markdown index a5f66140bd..6340a7037b 100644 --- a/website/docs/r/pi_instance.html.markdown +++ b/website/docs/r/pi_instance.html.markdown @@ -88,8 +88,8 @@ Review the argument references that you can specify for your resource. - `pi_storage_pool_affinity` - (Optional, Bool) Indicates if all volumes attached to the server must reside in the same storage pool. The default value is `true`. To attach data volumes from a different storage pool (mixed storage) set to `false` and use `pi_volume_attach` resource. Once set to `false`, cannot be set back to `true` unless all volumes attached reside in the same storage type and pool. - `pi_storage_type` - (Optional, String) - Storage type for server deployment. Only valid when you deploy one of the IBM supplied stock images. Storage type for a custom image (an imported image or an image that is created from a VM capture) defaults to the storage type the image was created in - `pi_storage_connection` - (Optional, String) - Storage Connectivity Group (SCG) for server deployment. Only supported value is `vSCSI`. -- `pi_sys_type` - (Optional, String) The type of system on which to create the VM (s922/e880/e980). - - Required when not creating SAP instances. Conflicts with `pi_sap_profile_id`. +- `pi_sys_type` - (Optional, String) The type of system on which to create the VM (s922/e880/e980/e1080/s1022). + - Supported SAP system types are (e880/e980/e1080). - `pi_user_data` - (Optional, String) The base64 encoded form of the user data `cloud-init` to pass to the instance during creation. - `pi_virtual_cores_assigned` - (Optional, Integer) Specify the number of virtual cores to be assigned. - `pi_volume_ids` - (Optional, List of String) The list of volume IDs that you want to attach to the instance during creation.