Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

P10 enablement for SAP #3534

Merged
merged 3 commits into from
Feb 11, 2022
Merged

P10 enablement for SAP #3534

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb68792
P10 enablement for SAP
Jan 26, 2022
06e82db
Fix error in instance docs
ChaseRun Feb 9, 2022
610dc33
Add newline to go.sum
ChaseRun Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,4 +1129,4 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
yussufsh marked this conversation as resolved.
Show resolved Hide resolved
15 changes: 8 additions & 7 deletions ibm/service/power/resource_ibm_pi_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions website/docs/r/pi_instance.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down