Skip to content

Commit 0d37964

Browse files
fix: ansible role version 2.1.1 fixes SLES init (#675)
1 parent 7ddaee0 commit 0d37964

File tree

8 files changed

+49
-49
lines changed

8 files changed

+49
-49
lines changed

ibm_catalog.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -84,75 +84,75 @@
8484
"required": true,
8585
"options": [
8686
{
87-
"displayname": "Dallas (dallas) PER",
87+
"displayname": "Dallas (dallas)",
8888
"value": "us-south"
8989
},
9090
{
91-
"displayname": "Dallas 10 (dal10) PER",
91+
"displayname": "Dallas 10 (dal10)",
9292
"value": "dal10"
9393
},
9494
{
95-
"displayname": "Dallas 12 (dal12) PER",
95+
"displayname": "Dallas 12 (dal12)",
9696
"value": "dal12"
9797
},
9898
{
99-
"displayname": "Frankfurt 1 (eu-de-1) PER",
99+
"displayname": "Frankfurt 1 (eu-de-1)",
100100
"value": "eu-de-1"
101101
},
102102
{
103-
"displayname": "Frankfurt 2 (eu-de-2) PER",
103+
"displayname": "Frankfurt 2 (eu-de-2)",
104104
"value": "eu-de-2"
105105
},
106106
{
107-
"displayname": "London 04 (lon04)",
107+
"displayname": "London 04 (lon04) Non-PER",
108108
"value": "lon04"
109109
},
110110
{
111-
"displayname": "London 06 (lon06) PER",
111+
"displayname": "London 06 (lon06)",
112112
"value": "lon06"
113113
},
114114
{
115-
"displayname": "Montreal 01 (mon01)",
115+
"displayname": "Montreal 01 (mon01) Non-PER",
116116
"value": "mon01"
117117
},
118118
{
119-
"displayname": "Osaka 21 (osa21) PER",
119+
"displayname": "Osaka 21 (osa21)",
120120
"value": "osa21"
121121
},
122122
{
123-
"displayname": "Sao Paulo 01 (sao01) PER",
123+
"displayname": "Sao Paulo 01 (sao01)",
124124
"value": "sao01"
125125
},
126126
{
127-
"displayname": "Sao Paulo 04 (sao04) PER",
127+
"displayname": "Sao Paulo 04 (sao04)",
128128
"value": "sao04"
129129
},
130130
{
131-
"displayname": "Sydney 04 (syd04) PER",
131+
"displayname": "Sydney 04 (syd04)",
132132
"value": "syd04"
133133
},
134134
{
135-
"displayname": "Sydney 05 (syd05) PER",
135+
"displayname": "Sydney 05 (syd05)",
136136
"value": "syd05"
137137
},
138138
{
139-
"displayname": "Tokyo 04 (tok04) PER",
139+
"displayname": "Tokyo 04 (tok04)",
140140
"value": "tok04"
141141
},
142142
{
143-
"displayname": "Toronto 01 (tor01) PER",
143+
"displayname": "Toronto 01 (tor01)",
144144
"value": "tor01"
145145
},
146146
{
147147
"displayname": "Washington DC (us-east)",
148148
"value": "us-east"
149149
},
150150
{
151-
"displayname": "Washington DC 06 (wdc06) PER",
151+
"displayname": "Washington DC 06 (wdc06)",
152152
"value": "wdc06"
153153
},
154154
{
155-
"displayname": "Washington DC 07 (wdc07) PER",
155+
"displayname": "Washington DC 07 (wdc07)",
156156
"value": "wdc07"
157157
}
158158
],
@@ -400,75 +400,75 @@
400400
"required": true,
401401
"options": [
402402
{
403-
"displayname": "Dallas (dallas) PER",
403+
"displayname": "Dallas (dallas)",
404404
"value": "us-south"
405405
},
406406
{
407-
"displayname": "Dallas 10 (dal10) PER",
407+
"displayname": "Dallas 10 (dal10)",
408408
"value": "dal10"
409409
},
410410
{
411-
"displayname": "Dallas 12 (dal12) PER",
411+
"displayname": "Dallas 12 (dal12)",
412412
"value": "dal12"
413413
},
414414
{
415-
"displayname": "Frankfurt 1 (eu-de-1) PER",
415+
"displayname": "Frankfurt 1 (eu-de-1)",
416416
"value": "eu-de-1"
417417
},
418418
{
419-
"displayname": "Frankfurt 2 (eu-de-2) PER",
419+
"displayname": "Frankfurt 2 (eu-de-2)",
420420
"value": "eu-de-2"
421421
},
422422
{
423-
"displayname": "London 04 (lon04)",
423+
"displayname": "London 04 (lon04) Non-PER",
424424
"value": "lon04"
425425
},
426426
{
427-
"displayname": "London 06 (lon06) PER",
427+
"displayname": "London 06 (lon06)",
428428
"value": "lon06"
429429
},
430430
{
431-
"displayname": "Montreal 01 (mon01)",
431+
"displayname": "Montreal 01 (mon01) Non-PER",
432432
"value": "mon01"
433433
},
434434
{
435-
"displayname": "Osaka 21 (osa21) PER",
435+
"displayname": "Osaka 21 (osa21)",
436436
"value": "osa21"
437437
},
438438
{
439-
"displayname": "Sao Paulo 01 (sao01) PER",
439+
"displayname": "Sao Paulo 01 (sao01)",
440440
"value": "sao01"
441441
},
442442
{
443-
"displayname": "Sao Paulo 04 (sao04) PER",
443+
"displayname": "Sao Paulo 04 (sao04)",
444444
"value": "sao04"
445445
},
446446
{
447-
"displayname": "Sydney 04 (syd04) PER",
447+
"displayname": "Sydney 04 (syd04)",
448448
"value": "syd04"
449449
},
450450
{
451-
"displayname": "Sydney 05 (syd05) PER",
451+
"displayname": "Sydney 05 (syd05)",
452452
"value": "syd05"
453453
},
454454
{
455-
"displayname": "Tokyo 04 (tok04) PER",
455+
"displayname": "Tokyo 04 (tok04)",
456456
"value": "tok04"
457457
},
458458
{
459-
"displayname": "Toronto 01 (tor01) PER",
459+
"displayname": "Toronto 01 (tor01)",
460460
"value": "tor01"
461461
},
462462
{
463463
"displayname": "Washington DC (us-east)",
464464
"value": "us-east"
465465
},
466466
{
467-
"displayname": "Washington DC 06 (wdc06) PER",
467+
"displayname": "Washington DC 06 (wdc06)",
468468
"value": "wdc06"
469469
},
470470
{
471-
"displayname": "Washington DC 07 (wdc07) PER",
471+
"displayname": "Washington DC 07 (wdc07)",
472472
"value": "wdc07"
473473
}
474474
],

modules/ansible/ansible_node_packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
############################################################
99

1010
GLOBAL_RHEL_PACKAGES="rhel-system-roles rhel-system-roles-sap expect"
11-
GLOBAL_GALAXY_COLLLECTIONS="ibm.power_linux_sap:2.1.0 ansible.utils:3.1.0 ansible.posix:1.5.4 community.general:8.4.0"
11+
GLOBAL_GALAXY_COLLLECTIONS="ibm.power_linux_sap:2.1.1 ansible.utils:3.1.0 ansible.posix:1.5.4 community.general:8.4.0"
1212

1313
############################################################
1414
# Start functions

modules/pi-sap-system-type1/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ The Power Virtual Server for SAP module automates the following tasks:
3434
| <a name="module_ansible_netweaver_sapmnt_mount"></a> [ansible\_netweaver\_sapmnt\_mount](#module\_ansible\_netweaver\_sapmnt\_mount) | ../ansible | n/a |
3535
| <a name="module_ansible_sap_instance_init"></a> [ansible\_sap\_instance\_init](#module\_ansible\_sap\_instance\_init) | ../ansible | n/a |
3636
| <a name="module_ansible_sharefs_instance_exportfs"></a> [ansible\_sharefs\_instance\_exportfs](#module\_ansible\_sharefs\_instance\_exportfs) | ../ansible | n/a |
37-
| <a name="module_pi_hana_instance"></a> [pi\_hana\_instance](#module\_pi\_hana\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.0.0 |
37+
| <a name="module_pi_hana_instance"></a> [pi\_hana\_instance](#module\_pi\_hana\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.0.1 |
3838
| <a name="module_pi_hana_storage_calculation"></a> [pi\_hana\_storage\_calculation](#module\_pi\_hana\_storage\_calculation) | ../pi-hana-storage-config | n/a |
39-
| <a name="module_pi_netweaver_instance"></a> [pi\_netweaver\_instance](#module\_pi\_netweaver\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.0.0 |
40-
| <a name="module_pi_sharefs_instance"></a> [pi\_sharefs\_instance](#module\_pi\_sharefs\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.0.0 |
39+
| <a name="module_pi_netweaver_instance"></a> [pi\_netweaver\_instance](#module\_pi\_netweaver\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.0.1 |
40+
| <a name="module_pi_sharefs_instance"></a> [pi\_sharefs\_instance](#module\_pi\_sharefs\_instance) | terraform-ibm-modules/powervs-instance/ibm | 2.0.1 |
4141

4242
### Resources
4343

modules/pi-sap-system-type1/main.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ locals {
2525

2626
module "pi_sharefs_instance" {
2727
source = "terraform-ibm-modules/powervs-instance/ibm"
28-
version = "2.0.0"
28+
version = "2.0.1"
2929
count = var.pi_sharefs_instance.enable ? 1 : 0
3030

3131
pi_workspace_guid = var.pi_workspace_guid
@@ -103,7 +103,7 @@ module "pi_hana_storage_calculation" {
103103

104104
module "pi_hana_instance" {
105105
source = "terraform-ibm-modules/powervs-instance/ibm"
106-
version = "2.0.0"
106+
version = "2.0.1"
107107

108108
pi_workspace_guid = var.pi_workspace_guid
109109
pi_instance_name = local.pi_hana_instance_name
@@ -141,7 +141,7 @@ resource "time_sleep" "wait_1_min" {
141141

142142
module "pi_netweaver_instance" {
143143
source = "terraform-ibm-modules/powervs-instance/ibm"
144-
version = "2.0.0"
144+
version = "2.0.1"
145145
count = var.pi_netweaver_instance.instance_count
146146
depends_on = [time_sleep.wait_1_min]
147147

reference-architectures/sap-ready-to-go/deploy-arch-ibm-pvs-sap-ready-to-go.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
copyright:
44
years: 2024
5-
lastupdated: "2024-05-26"
5+
lastupdated: "2024-05-31"
66
keywords:
77
subcollection: deployable-reference-architectures
88
authors:
@@ -16,7 +16,7 @@ use-case: ITServiceManagement
1616
industry: Technology
1717
compliance: SAPCertified
1818
content-type: reference-architecture
19-
version: v2.0.0
19+
version: v2.0.1
2020
related_links:
2121
- title: 'SAP in IBM Cloud documentation'
2222
url: 'https://cloud.ibm.com/docs/sap'
@@ -38,7 +38,7 @@ related_links:
3838
{: toc-industry="Technology"}
3939
{: toc-use-case="ITServiceManagement"}
4040
{: toc-compliance="SAPCertified"}
41-
{: toc-version="2.0.0"}
41+
{: toc-version="2.0.1"}
4242

4343
The SAP-ready PowerVS variation of the Power Virtual Server for SAP HANA creates a basic and expandable SAP system landscape. The variation builds on the foundation of the VPC landing zone and Power Virtual Server with VPC landing zone. PowerVS instances for SAP HANA, SAP NetWeaver, and optionally for shared SAP files are deployed and preconfigured for SAP installation.
4444

reference-architectures/sap-s4hana-bw4hana/deploy-arch-ibm-pvs-sap-s4hana-bw4hana.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
copyright:
44
years: 2024
5-
lastupdated: "2024-05-26"
5+
lastupdated: "2024-05-31"
66
keywords:
77
subcollection: deployable-reference-architectures
88
authors:
@@ -16,7 +16,7 @@ use-case: ITServiceManagement
1616
industry: Technology
1717
compliance: SAPCertified
1818
content-type: reference-architecture
19-
version: v2.0.0
19+
version: v2.0.1
2020
related_links:
2121
- title: 'SAP in IBM Cloud documentation'
2222
url: 'https://cloud.ibm.com/docs/sap'
@@ -38,7 +38,7 @@ related_links:
3838
{: toc-industry="Technology"}
3939
{: toc-use-case="ITServiceManagement"}
4040
{: toc-compliance="SAPCertified"}
41-
{: toc-version="2.0.0"}
41+
{: toc-version="2.0.1"}
4242

4343
'SAP S/4HANA or BW/4HANA' variation of 'Power Virtual Server for SAP HANA' creates a basic and expandable SAP system landscape built on the foundation of 'Power Virtual Server with VPC landing zone'. PowerVS instances for SAP HANA, SAP NetWeaver, and optionally for shared SAP files are deployed and preconfigured for SAP installation. The S/4HANA or BW/4HANA solution is installed based on the selected version.
4444

solutions/e2e/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The end-to-end solution automates the following tasks:
5959

6060
| Name | Source | Version |
6161
|------|--------|---------|
62-
| <a name="module_fullstack"></a> [fullstack](#module\_fullstack) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 5.1.2 |
62+
| <a name="module_fullstack"></a> [fullstack](#module\_fullstack) | terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone | 5.1.4 |
6363
| <a name="module_sap_system"></a> [sap\_system](#module\_sap\_system) | ../../modules/pi-sap-system-type1 | n/a |
6464

6565
### Resources

solutions/e2e/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
module "fullstack" {
99
source = "terraform-ibm-modules/powervs-infrastructure/ibm//modules/powervs-vpc-landing-zone"
10-
version = "5.1.2"
10+
version = "5.1.4"
1111

1212
providers = { ibm.ibm-is = ibm.ibm-is, ibm.ibm-pi = ibm.ibm-pi, ibm.ibm-sm = ibm.ibm-sm }
1313

0 commit comments

Comments
 (0)