Skip to content

Commit 2616d59

Browse files
fix: beta version (#422)
1 parent 578b234 commit 2616d59

File tree

14 files changed

+55
-664
lines changed

14 files changed

+55
-664
lines changed

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ You need the following permissions to run this module.
110110

111111
- [ Basic Power Virtual Server for SAP HANA Module Example](solutions/basic)
112112
- [ Power Virtual Server for SAP HANA example to create SAP prepared PowerVS instances from IBM Cloud Catalog](solutions/ibm-catalog/deployable-architectures/sap-ready-to-go)
113-
- [ Power Virtual Server for SAP HANA example to create SAP prepared PowerVS instances](solutions/terraform-registry/sap-ready-to-go)
114113
<!-- END EXAMPLES HOOK -->
115114

116115
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

ibm_catalog.json

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"catalogID": "da12d6f3-3cb7-402e-9350-878837212a6e",
9797
"flavorConstraint": "powervs-workspace",
9898
"offeringID": "2dd486c7-b317-4aaa-907b-42671485ad96",
99-
"versionConstraint": "\u003e=8.0.0"
99+
"versionConstraint": "\u003e=1.0.0"
100100
},
101101
"grouping": "deployment",
102102
"original_grouping": "deployment",
@@ -135,14 +135,6 @@
135135
"displayname": "Montreal (mon01)",
136136
"value": "mon01"
137137
},
138-
{
139-
"displayname": "Dallas (dal12)",
140-
"value": "dal12"
141-
},
142-
{
143-
"displayname": "Dallas (dal13)",
144-
"value": "dal13"
145-
},
146138
{
147139
"displayname": "Osaka (osa21)",
148140
"value": "osa21"
@@ -160,24 +152,24 @@
160152
"value": "syd05"
161153
},
162154
{
163-
"displayname": "US-east (us-east)",
164-
"value": "us-east"
155+
"displayname": "Sao Paulo (sao01)",
156+
"value": "sao01"
165157
},
166158
{
167159
"displayname": "US-south (us-south)",
168160
"value": "us-south"
169161
},
170162
{
171-
"displayname": "Sao Paulo (sao01)",
172-
"value": "sao01"
163+
"displayname": "Dallas (dal10)",
164+
"value": "dal10"
173165
},
174166
{
175-
"displayname": "Washington DC (wdc04)",
176-
"value": "wdc04"
167+
"displayname": "Dallas (dal12)",
168+
"value": "dal12"
177169
},
178170
{
179-
"displayname": "Washington DC (wdc06)",
180-
"value": "wdc06"
171+
"displayname": "US-east (us-east)",
172+
"value": "us-east"
181173
}
182174
],
183175
"hidden": false,
@@ -251,6 +243,16 @@
251243
"required": true,
252244
"type": "password"
253245
},
246+
{
247+
"key": "ibmcloud_api_key",
248+
"type": "multiline_secure_value",
249+
"required": true,
250+
"custom_config": {
251+
"grouping": "deployment",
252+
"original_grouping": "deployment",
253+
"type": "multiline_secure_value"
254+
}
255+
},
254256
{
255257
"key": "sap_domain",
256258
"required": true
@@ -297,27 +299,21 @@
297299
],
298300
"outputs": [
299301
{
300-
"description": "Private IPs of the Share FS instance.",
301302
"key": "share_fs_ips"
302303
},
303304
{
304-
"description": "All private IPS of PowerVS instances and Jump IP to access the host.",
305305
"key": "powervs_lpars_data"
306306
},
307307
{
308-
"description": "Data from PowerVS infrastructure layer",
309308
"key": "infrastructure_data"
310309
},
311310
{
312-
"description": "Public IP of Provided Bastion/JumpServer Host",
313311
"key": "access_host_or_ip"
314312
},
315313
{
316-
"description": "All private IPS of HANA instance",
317314
"key": "hana_ips"
318315
},
319316
{
320-
"description": "All private IPS of NetWeaver instances",
321317
"key": "netweaver_ips"
322318
}
323319
],
@@ -355,7 +351,7 @@
355351
],
356352
"id": "2dd486c7-b317-4aaa-907b-42671485ad96",
357353
"name": "deploy-arch-ibm-pvs-inf",
358-
"version": ">=7.0.0"
354+
"version": ">=1.0.0"
359355
}
360356
],
361357
"architecture": {

solutions/basic/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Use of this resource for production deployments is not recommended. Instead, gen
2424

2525
| Name | Source | Version |
2626
|------|--------|---------|
27-
| <a name="module_power_infrastructure"></a> [power\_infrastructure](#module\_power\_infrastructure) | terraform-ibm-modules/powervs-infrastructure/ibm | 8.3.0 |
27+
| <a name="module_power_infrastructure"></a> [power\_infrastructure](#module\_power\_infrastructure) | terraform-ibm-modules/powervs-infrastructure/ibm | 1.0.0 |
2828
| <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | terraform-ibm-modules/resource-group/ibm | 1.0.5 |
2929
| <a name="module_sap_systems"></a> [sap\_systems](#module\_sap\_systems) | ../../ | n/a |
3030

solutions/basic/main.tf

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
locals {
22
ibm_powervs_zone_region_map = {
3-
"syd04" = "syd"
4-
"syd05" = "syd"
5-
"eu-de-1" = "eu-de"
6-
"eu-de-2" = "eu-de"
73
"lon04" = "lon"
84
"lon06" = "lon"
9-
"tok04" = "tok"
10-
"us-east" = "us-east"
11-
"us-south" = "us-south"
12-
"dal12" = "us-south"
5+
"eu-de-1" = "eu-de"
6+
"eu-de-2" = "eu-de"
137
"tor01" = "tor"
8+
"mon01" = "mon"
149
"osa21" = "osa"
10+
"tok04" = "tok"
11+
"syd04" = "syd"
12+
"syd05" = "syd"
1513
"sao01" = "sao"
16-
"mon01" = "mon"
14+
"us-south" = "us-south"
15+
"dal10" = "us-south"
16+
"dal12" = "us-south"
17+
"us-east" = "us-east"
1718
}
1819

1920
ibm_powervs_zone_cloud_region_map = {
@@ -24,13 +25,14 @@ locals {
2425
"lon04" = "eu-gb"
2526
"lon06" = "eu-gb"
2627
"tok04" = "jp-tok"
27-
"us-east" = "us-east"
28-
"us-south" = "us-south"
29-
"dal12" = "us-south"
3028
"tor01" = "ca-tor"
3129
"osa21" = "jp-osa"
3230
"sao01" = "br-sao"
3331
"mon01" = "ca-tor"
32+
"us-south" = "us-south"
33+
"dal10" = "us-south"
34+
"dal12" = "us-south"
35+
"us-east" = "us-east"
3436
}
3537
}
3638

@@ -87,7 +89,7 @@ module "power_infrastructure" {
8789
# Add explicit depends_on here due to https://github.com/terraform-ibm-modules/terraform-ibm-powervs-infrastructure/issues/143
8890
depends_on = [module.resource_group]
8991
source = "terraform-ibm-modules/powervs-infrastructure/ibm"
90-
version = "8.3.0"
92+
version = "1.0.0"
9193
powervs_zone = var.powervs_zone
9294
powervs_resource_group_name = module.resource_group.resource_group_name
9395
powervs_workspace_name = local.powervs_workspace_name

solutions/ibm-catalog/deployable-architectures/sap-ready-to-go/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ If you do not have a PowerVS infrastructure that is the full stack solution for
5050
| <a name="input_default_netweaver_sles_image"></a> [default\_netweaver\_sles\_image](#input\_default\_netweaver\_sles\_image) | Default SuSE Linux image to use for SAP NetWeaver PowerVS instances. | `string` | `"SLES15-SP3-SAP-NETWEAVER"` | no |
5151
| <a name="input_default_shared_fs_rhel_image"></a> [default\_shared\_fs\_rhel\_image](#input\_default\_shared\_fs\_rhel\_image) | Default Red Hat Linux image to use for SAP shared FS PowerVS instances. | `string` | `"RHEL8-SP4-SAP-NETWEAVER"` | no |
5252
| <a name="input_default_shared_fs_sles_image"></a> [default\_shared\_fs\_sles\_image](#input\_default\_shared\_fs\_sles\_image) | Default SuSE Linux image to use for SAP shared FS PowerVS instances. | `string` | `"SLES15-SP3-SAP-NETWEAVER"` | no |
53-
| <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud platform API key needed to deploy IAM enabled resources. | `string` | `null` | no |
53+
| <a name="input_ibmcloud_api_key"></a> [ibmcloud\_api\_key](#input\_ibmcloud\_api\_key) | The IBM Cloud platform API key needed to deploy IAM enabled resources. | `string` | n/a | yes |
5454
| <a name="input_os_image_distro"></a> [os\_image\_distro](#input\_os\_image\_distro) | Image distribution to use for all instances(Shared, HANA, Netweaver). OS release versions may be specified in optional parameters. | `string` | `"RHEL"` | no |
5555
| <a name="input_powervs_sap_network_cidr"></a> [powervs\_sap\_network\_cidr](#input\_powervs\_sap\_network\_cidr) | Network range for separate SAP network. E.g., '10.53.1.0/24' | `string` | `"10.53.1.0/24"` | no |
56-
| <a name="input_powervs_zone"></a> [powervs\_zone](#input\_powervs\_zone) | IBM Cloud data center location where IBM PowerVS infrastructure will be created. | `string` | n/a | yes |
56+
| <a name="input_powervs_zone"></a> [powervs\_zone](#input\_powervs\_zone) | IBM Cloud data center location where IBM PowerVS Workspace exists. | `string` | n/a | yes |
5757
| <a name="input_prefix"></a> [prefix](#input\_prefix) | Unique prefix for resources to be created (e.g., SAP system name). Max length must be less than or equal to 6. | `string` | n/a | yes |
5858
| <a name="input_prerequisite_workspace_id"></a> [prerequisite\_workspace\_id](#input\_prerequisite\_workspace\_id) | IBM Cloud Schematics workspace ID of an existing Power infrastructure for regulated industries deployment. If you do not yet have an existing deployment, click [here](https://cloud.ibm.com/catalog/) and search for 'Power Virtual Server with VPC landing zone' to create one. | `string` | n/a | yes |
5959
| <a name="input_sap_domain"></a> [sap\_domain](#input\_sap\_domain) | SAP domain to be set for entire landscape. Set to null or empty if not configuring OS. | `string` | `"sap.com"` | no |
6060
| <a name="input_sap_hana_additional_storage_config"></a> [sap\_hana\_additional\_storage\_config](#input\_sap\_hana\_additional\_storage\_config) | Additional File systems to be created and attached to PowerVS instance for SAP HANA. 'disk\_sizes' are in GB. 'count' specify over how many storage volumes the file system will be striped. 'tiers' specifies the storage tier in PowerVS workspace. For creating multiple file systems, specify multiple entries in each parameter in the structure. E.g., for creating 2 file systems, specify 2 names, 2 disk sizes, 2 counts, 2 tiers and 2 paths. | <pre>object({<br> names = string<br> disks_size = string<br> counts = string<br> tiers = string<br> paths = string<br> })</pre> | <pre>{<br> "counts": "1",<br> "disks_size": "50",<br> "names": "usrsap",<br> "paths": "/usr/sap",<br> "tiers": "tier3"<br>}</pre> | no |
6161
| <a name="input_sap_hana_custom_storage_config"></a> [sap\_hana\_custom\_storage\_config](#input\_sap\_hana\_custom\_storage\_config) | Custom File systems to be created and attached to PowerVS instance for SAP HANA. 'disk\_sizes' are in GB. 'count' specify over how many storage volumes the file system will be striped. 'tiers' specifies the storage tier in PowerVS workspace. For creating multiple file systems, specify multiple entries in each parameter in the structure. E.g., for creating 2 file systems, specify 2 names, 2 disk sizes, 2 counts, 2 tiers and 2 paths. | <pre>object({<br> names = string<br> disks_size = string<br> counts = string<br> tiers = string<br> paths = string<br> })</pre> | <pre>{<br> "counts": "",<br> "disks_size": "",<br> "names": "",<br> "paths": "",<br> "tiers": ""<br>}</pre> | no |
6262
| <a name="input_sap_hana_hostname"></a> [sap\_hana\_hostname](#input\_sap\_hana\_hostname) | SAP HANA hostname (non FQDN). Will get the form of <prefix>-<sap\_hana\_hostname>. Max length of final hostname must be <= 13 characters. | `string` | `"hana"` | no |
6363
| <a name="input_sap_hana_instance_config"></a> [sap\_hana\_instance\_config](#input\_sap\_hana\_instance\_config) | SAP HANA PowerVS instance configuration. If data is specified here - will replace other input. | <pre>object({<br> os_image_name = string<br> sap_profile_id = string<br> })</pre> | <pre>{<br> "os_image_name": "",<br> "sap_profile_id": ""<br>}</pre> | no |
64-
| <a name="input_sap_hana_profile"></a> [sap\_hana\_profile](#input\_sap\_hana\_profile) | SAP HANA profile to use. Must be one of the supported profiles. See [here](https://cloud.ibm.com/docs/sap?topic=sap-hana-iaas-offerings-profiles-power-vs). File system sizes are automatically calculated. Override automatic calculation by setting values in optional sap\_hana\_custom\_storage\_config parameter. | `string` | `"ush1-4x128"` | no |
64+
| <a name="input_sap_hana_profile"></a> [sap\_hana\_profile](#input\_sap\_hana\_profile) | SAP HANA profile to use. Must be one of the supported profiles. See [here](https://cloud.ibm.com/docs/sap?topic=sap-hana-iaas-offerings-profiles-power-vs). File system sizes are automatically calculated. Override automatic calculation by setting values in optional sap\_hana\_custom\_storage\_config parameter. | `string` | `"ush1-4x256"` | no |
6565
| <a name="input_sap_netweaver_cpu_number"></a> [sap\_netweaver\_cpu\_number](#input\_sap\_netweaver\_cpu\_number) | Number of CPUs for each SAP NetWeaver instance. | `string` | `"3"` | no |
6666
| <a name="input_sap_netweaver_hostname"></a> [sap\_netweaver\_hostname](#input\_sap\_netweaver\_hostname) | SAP Netweaver hostname (non FQDN). Will get the form of <prefix>-<sap\_netweaver\_hostname>-<number>. Max length of final hostname must be <= 13 characters. | `string` | `"nw"` | no |
6767
| <a name="input_sap_netweaver_instance_config"></a> [sap\_netweaver\_instance\_config](#input\_sap\_netweaver\_instance\_config) | SAP NetWeaver PowerVS instance configuration. If data is specified here - will replace other input. | <pre>object({<br> number_of_instances = string<br> os_image_name = string<br> number_of_processors = string<br> memory_size = string<br> cpu_proc_type = string<br> server_type = string<br> })</pre> | <pre>{<br> "cpu_proc_type": "shared",<br> "memory_size": "",<br> "number_of_instances": "",<br> "number_of_processors": "",<br> "os_image_name": "",<br> "server_type": "s922"<br>}</pre> | no |

solutions/ibm-catalog/deployable-architectures/sap-ready-to-go/main.tf

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,15 @@ locals {
66
"eu-de-2" = "eu-de"
77
"tor01" = "tor"
88
"mon01" = "mon"
9-
"dal12" = "us-south"
10-
"dal13" = "us-south"
119
"osa21" = "osa"
1210
"tok04" = "tok"
1311
"syd04" = "syd"
1412
"syd05" = "syd"
15-
"us-east" = "us-east"
16-
"us-south" = "us-south"
1713
"sao01" = "sao"
18-
"sao04" = "sao"
19-
"wdc04" = "us-east"
20-
"wdc06" = "us-east"
21-
"wdc07" = "us-east"
14+
"us-south" = "us-south"
15+
"dal10" = "us-south"
16+
"dal12" = "us-south"
17+
"us-east" = "us-east"
2218
}
2319
}
2420

solutions/ibm-catalog/deployable-architectures/sap-ready-to-go/variables.tf

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ variable "prerequisite_workspace_id" {
44
}
55

66
variable "powervs_zone" {
7-
description = "IBM Cloud data center location where IBM PowerVS infrastructure will be created."
7+
description = "IBM Cloud data center location where IBM PowerVS Workspace exists."
88
type = string
99
}
1010

@@ -29,6 +29,12 @@ variable "powervs_sap_network_cidr" {
2929
default = "10.53.1.0/24"
3030
}
3131

32+
variable "ibmcloud_api_key" {
33+
description = "The IBM Cloud platform API key needed to deploy IAM enabled resources."
34+
type = string
35+
sensitive = true
36+
}
37+
3238
#####################################################
3339
# PowerVS Shared FS Instance parameters
3440
#####################################################
@@ -52,7 +58,7 @@ variable "sap_hana_hostname" {
5258
variable "sap_hana_profile" {
5359
description = "SAP HANA profile to use. Must be one of the supported profiles. See [here](https://cloud.ibm.com/docs/sap?topic=sap-hana-iaas-offerings-profiles-power-vs). File system sizes are automatically calculated. Override automatic calculation by setting values in optional sap_hana_custom_storage_config parameter."
5460
type = string
55-
default = "ush1-4x128"
61+
default = "ush1-4x256"
5662
}
5763

5864
#####################################################
@@ -271,10 +277,3 @@ variable "sap_netweaver_storage_config" {
271277
paths = "/usr/sap,/usr/sap/trans"
272278
}
273279
}
274-
275-
variable "ibmcloud_api_key" {
276-
description = "The IBM Cloud platform API key needed to deploy IAM enabled resources."
277-
type = string
278-
sensitive = true
279-
default = null
280-
}

0 commit comments

Comments
 (0)