Skip to content

Commit 6a951d2

Browse files
sean-freemansean-freeman
authored
Merge pull request #33 from sap-linuxlab/dev
0.7.5 release
2 parents 03f24a7 + 7eeae92 commit 6a951d2

File tree

24 files changed

+63
-154
lines changed

24 files changed

+63
-154
lines changed

‎README.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ Therefore it is not possible to match precisely the same functionality when boot
2929

3030
In addition, dependant upon the additional configuration and policies within an existing configured environment - these Terraform Modules for SAP may not work at all and may require custom changes to fit the bespoke environment.
3131

32-
Contributions to these Terraform Modules need to retain as much parity across each infrastructure platform.
32+
For further information, please see below for the [Infrastructure provisioning parity comparison](#infrastructure-provisioning-parity-comparison) table.
33+
34+
N.B. Contributions to these Terraform Modules need to retain as much parity across each infrastructure platform.
3335

3436
## Execution time
3537

@@ -42,6 +44,8 @@ Please note, for all SAP software installations the execution time will vary bas
4244

4345
All detailed execution permissions are listed in the documentation for the Terraform Modules of each Infrastructure Platform. See the next section.
4446

47+
---
48+
4549
## List of Terraform Modules for SAP
4650

4751
The below table lists the Terraform Modules for SAP, and any detailed documentation:
@@ -86,17 +90,17 @@ The below table lists the Terraform Modules for SAP, and any detailed documentat
8690
| &emsp;&emsp;*Compute*<br/>&emsp;&emsp;*Type* | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) | Virtual Machine<br> (Type 1) |
8791
| &emsp;&emsp;*Compute*<br/>&emsp;&emsp;*Hypervisor* | KVM | KVM | HyperV | KVM | IBM PowerVM<br> (PHYP LE) | IBM PowerVM<br> (PHYP LE) | VMware vSphere |
8892
| <br/><br/>***Account Init*** | | | | | | | |
89-
| Create Resource Group, or re-use existing Resource Group | :x: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
93+
| Create Resource Group, or re-use existing Resource Group | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
9094
| Create VPC/VNet, or re-use existing VPC/VNet | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
9195
| Create Subnet, or re-use existing Subnet | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
9296
| Create Many-to-One NAT Gateway (Public Internet access for hosts) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
9397
| <br/>***Account Bootstrap<br/>(aka. minimal landing zone)*** | | | | | | | |
9498
| Create Private DNS | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
95-
| Create Network Interconnectivity hub (e.g. Transit Gateway) | :white_check_mark: | :x: | :x: | :white_check_mark: | :white_check_mark: | N/A | N/A |
99+
| Create Network Interconnectivity hub (e.g. Transit Gateway) | :white_check_mark: | :no_entry_sign: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | N/A | N/A |
96100
| Create Network Security for Subnet/s (e.g. ACL, NSG) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
97-
| Create Network Security for Host/s (e.g. Security Groups) | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
101+
| Create Network Security for Host/s (e.g. Security Groups) | :white_check_mark: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
98102
| Create TLS key pair for SSH (using RSA algorithm) | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
99-
| Import public key to Cloud platform | :white_check_mark: | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
103+
| Import public key to Cloud platform | :white_check_mark: | :no_entry_sign: | :white_check_mark: | :white_check_mark: | :white_check_mark: | N/A | N/A |
100104
| <br/>***Account IAM*** | | | | | | | |
101105
| Create IAM Access Group/s and contained Policies for SAP 'Basis' Administrators | :x: WIP | :x: WIP | :x: WIP | :warning: WIP | :x: WIP | N/A | N/A |
102106
| <br/>***Bastion Injection*** | | | | | | | |
@@ -123,3 +127,9 @@ The below table lists the Terraform Modules for SAP, and any detailed documentat
123127
| Build scripts for Host:<sub><br> - Enable root login<br> - Set hostname<br> - Set DNS in resolv.conf<br> - Disks and Filesystem setup (LVM with XFS and striping, or Physical with XFS)</sub> | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: |
124128
| Build scripts for increased security Hosts:<sub><br> - Set DNS Proxy in resolv.conf<br> - Set Web Proxy for non-interactive login shell</sub> | N/A | N/A | N/A | N/A | :white_check_mark: | :white_check_mark: | :white_check_mark: |
125129
| Build scripts for BYOL OS:<sub><br> - Enable OS Subscription with BYOL, setup OS Package Repositories</sub> | N/A | N/A | N/A | N/A | :white_check_mark: | :white_check_mark: | :white_check_mark: |
130+
131+
<sub>**Key:**</sub>
132+
- :white_check_mark: <sub>Ready and Tested</sub>
133+
- :warning: <sub>Pending work</sub>
134+
- :x: <sub>Not available yet</sub>
135+
- :no_entry_sign: <sub>Capability not provided by vendor (or construct concept does not exist)</sub>

‎all/ansible_sap_ecc_sapase_install/create_ansible_extravars.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ sap_swpm_templates_install_dictionary:
139139
- 'igshelper_17-10010245.sar'
140140
- 'SYBCTRL_1110-80002616.SAR'
141141
- '51056224_1' # SAP ASE 16.0.03.13 RDBMS Linux on x86_64 64bit
142-
- 'ASEBC16004P_3-20012477.SAR' # SAP ASE 16.0 FOR BUS. SUITE DBCLIENT SP04 PL03
142+
- 'ASEBC16004P_3-20012477.SAR' # SAP ASE 16.0 FOR BUS. SUITE DBCLIENT SP04 Patch Level x (e.g. 03)
143143
- '51050708_1' # SAP ERP 6.0 EHP8 Installation Export 1/4, Self-extract RAR EXE
144144
- '51050708_2'
145145
- '51050708_3'
@@ -204,7 +204,7 @@ sap_swpm_templates_install_dictionary:
204204
- 'igshelper_17-10010245.sar'
205205
- 'SYBCTRL_1110-80002616.SAR'
206206
- '51056224_1' # SAP ASE 16.0.03.13 RDBMS Linux on x86_64 64bit
207-
- 'ASEBC16004P_3-20012477.SAR' # SAP ASE 16.0 FOR BUS. SUITE DBCLIENT SP04 PL03
207+
- 'ASEBC16004P_3-20012477.SAR' # SAP ASE 16.0 FOR BUS. SUITE DBCLIENT SP04 Patch Level x (e.g. 03)
208208
- '51053216_1' # IDES SAP ERP 6.0 EHP8 - INSTALL. EXP. (1/2) 1/22
209209
- '51053216_2'
210210
- '51053216_3'

‎all/ansible_sap_nwas_abap_sapase_install/create_ansible_extravars.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ sap_swpm_templates_install_dictionary:
133133
- 'igshelper_17-10010245.sar'
134134
- 'SYBCTRL_1110-80002616.SAR'
135135
- '51056224_1' # SAP ASE 16.0.03.13 RDBMS Linux on x86_64 64bit
136-
- 'ASEBC16004P_3-20012477.SAR' # SAP ASE 16.0 FOR BUS. SUITE DBCLIENT SP04 PL03
136+
- 'ASEBC16004P_3-20012477.SAR' # SAP ASE 16.0 FOR BUS. SUITE DBCLIENT SP04 Patch Level x (e.g. 03)
137137
- '51051806_1' # NetWeaver AS ABAP 7.52 Innovation Pkg - Installation Exp 1/2, RAR
138138
- '51051806_2' # NetWeaver AS ABAP 7.52 Innovation Pkg - Installation Exp 2/2, RAR
139139
@@ -185,7 +185,7 @@ sap_swpm_templates_install_dictionary:
185185
- 'igshelper_17-10010245.sar'
186186
- 'SYBCTRL_1110-80002616.SAR'
187187
- '51056224_1' # SAP ASE 16.0.03.13 RDBMS Linux on x86_64 64bit
188-
- 'ASEBC16004P_3-20012477.SAR' # SAP ASE 16.0 FOR BUS. SUITE DBCLIENT SP04 PL03
188+
- 'ASEBC16004P_3-20012477.SAR' # SAP ASE 16.0 FOR BUS. SUITE DBCLIENT SP04 Patch Level x (e.g. 03)
189189
- '51050829_3' # SAP Netweaver 7.5 Installation Export, ZIP
190190
# - '51050829_4' # NW 7.5 Language 1/2
191191
# - '51050829_5' # NW 7.5 Language 2/2

‎all/ansible_sap_nwas_java_sapase_install/create_ansible_extravars.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ sap_swpm_templates_install_dictionary:
134134
- 'SAPHOSTAGENT56_56-80004822.SAR' # SAP Host Agent 7.22
135135
- 'SAPJVM8_90-80000202.SAR' # SAP JVM 8.1
136136
- '51055106' # SAP Netweaver 7.5 SP22 Java, ZIP. Contains JAVA_EXPORT (SAP:JEXPORT:750:SP22:*:*), JAVA_EXPORT_JDMP (SAP:JDMP:750:SP22:*:SW-LABEL), JAVA_J2EE_OSINDEP (SAP:J2EE-CD:750:J2EE-CD:j2ee-cd:*), JAVA_J2EE_OSINDEP_J2EE_INST (SAP:J2EE-INST:750:SP22:*:*), JAVA_J2EE_OSINDEP_UT (SAP:UT:750:SP22:*:*)
137-
- '51056021_1' # SAP ASE 16.0.04.03 HF1 RDBMS Linux on x86_64 64bit
138-
- 'ASEBC16004P_2-20012477.SAR' # SAP ASE 16.0 FOR BUS. SUITE DBCLIENT SP04 PL02
137+
- '51056224_1' # SAP ASE 16.0.03.13 RDBMS Linux on x86_64 64bit
138+
- 'ASEBC16004P_3-20012477.SAR' # SAP ASE 16.0 FOR BUS. SUITE DBCLIENT SP04 Patch Level x (e.g. 03)
139139
140140
softwarecenter_search_list_ppc64le:
141141
- 'SAPCAR_1115-70006238.EXE'

‎aws_ec2_instance/host_network_access_sap/network_security_groups_sap_hana.tf

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,13 @@ resource "aws_security_group_rule" "vpc_sg_rule_tcp_egress_saphana_index_mdc_1"
105105

106106

107107
# SAP HANA for SOAP over HTTP for SAP Instance Agent (SAPStartSrv, i.e. host:port/SAPControl?wsdl), access from within the same Subnet
108+
# SAP HANA for SOAP over HTTPS (Secure) for SAP Instance Agent (SAPStartSrv, i.e. host:port/SAPControl?wsdl), access from within the same Subnet
108109
resource "aws_security_group_rule" "vpc_sg_rule_tcp_ingress_saphana_startsrv_http_soap" {
109110
count = local.network_rules_sap_hana_boolean ? 1 : 0
110111
security_group_id = var.module_var_host_security_group_id
111112
type = "ingress"
112113
from_port = tonumber("5${var.module_var_sap_hana_instance_no}13")
113-
to_port = tonumber("5${var.module_var_sap_hana_instance_no}13")
114+
to_port = tonumber("5${var.module_var_sap_hana_instance_no}14")
114115
protocol = "tcp"
115116
cidr_blocks = ["${local.target_subnet_ip_range}"]
116117
}
@@ -119,27 +120,6 @@ resource "aws_security_group_rule" "vpc_sg_rule_tcp_egress_saphana_startsrv_http
119120
security_group_id = var.module_var_host_security_group_id
120121
type = "egress"
121122
from_port = tonumber("5${var.module_var_sap_hana_instance_no}13")
122-
to_port = tonumber("5${var.module_var_sap_hana_instance_no}13")
123-
protocol = "tcp"
124-
cidr_blocks = ["${local.target_subnet_ip_range}"]
125-
}
126-
127-
128-
# SAP HANA for SOAP over HTTPS (Secure) for SAP Instance Agent (SAPStartSrv, i.e. host:port/SAPControl?wsdl), access from within the same Subnet
129-
resource "aws_security_group_rule" "vpc_sg_rule_tcp_ingress_saphana_startsrv_https_soap" {
130-
count = local.network_rules_sap_hana_boolean ? 1 : 0
131-
security_group_id = var.module_var_host_security_group_id
132-
type = "ingress"
133-
from_port = tonumber("5${var.module_var_sap_hana_instance_no}14")
134-
to_port = tonumber("5${var.module_var_sap_hana_instance_no}14")
135-
protocol = "tcp"
136-
cidr_blocks = ["${local.target_subnet_ip_range}"]
137-
}
138-
resource "aws_security_group_rule" "vpc_sg_rule_tcp_egress_saphana_startsrv_https_soap" {
139-
count = local.network_rules_sap_hana_boolean ? 1 : 0
140-
security_group_id = var.module_var_host_security_group_id
141-
type = "egress"
142-
from_port = tonumber("5${var.module_var_sap_hana_instance_no}14")
143123
to_port = tonumber("5${var.module_var_sap_hana_instance_no}14")
144124
protocol = "tcp"
145125
cidr_blocks = ["${local.target_subnet_ip_range}"]

‎gcp_ce_vm/host_network_access_sap/network_security_fw_rules_sap_hana.tf

Lines changed: 3 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,15 @@ resource "google_compute_firewall" "vpc_fw_rule_tcp_egress_saphana_index_mdc_1"
167167

168168

169169
# SAP HANA for SOAP over HTTP for SAP Instance Agent (SAPStartSrv, i.e. host:port/SAPControl?wsdl), access from within the same Subnet
170+
# SAP HANA for SOAP over HTTPS (Secure) for SAP Instance Agent (SAPStartSrv, i.e. host:port/SAPControl?wsdl), access from within the same Subnet
170171
resource "google_compute_firewall" "vpc_fw_rule_tcp_ingress_saphana_startsrv_http_soap" {
171172
count = local.network_rules_sap_hana_boolean ? 1 : 0
172173
name = "${var.module_var_resource_prefix}-vpc-fw-ingress-saphana-startsrv-http"
173174
network = local.target_vpc_name
174175

175176
allow {
176177
protocol = "tcp"
177-
ports = [tonumber("5${var.module_var_sap_hana_instance_no}13")]
178+
ports = ["5${var.module_var_sap_hana_instance_no}13-5${var.module_var_sap_hana_instance_no}14"]
178179
}
179180

180181
direction = "INGRESS"
@@ -188,38 +189,7 @@ resource "google_compute_firewall" "vpc_fw_rule_tcp_egress_saphana_startsrv_http
188189

189190
allow {
190191
protocol = "tcp"
191-
ports = [tonumber("5${var.module_var_sap_hana_instance_no}13")]
192-
}
193-
194-
direction = "EGRESS"
195-
destination_ranges = ["${local.target_vpc_subnet_range}"]
196-
# source_ranges =
197-
}
198-
199-
200-
# SAP HANA for SOAP over HTTPS (Secure) for SAP Instance Agent (SAPStartSrv, i.e. host:port/SAPControl?wsdl), access from within the same Subnet
201-
resource "google_compute_firewall" "vpc_fw_rule_tcp_ingress_saphana_startsrv_https_soap" {
202-
count = local.network_rules_sap_hana_boolean ? 1 : 0
203-
name = "${var.module_var_resource_prefix}-vpc-fw-ingress-saphana-startsrv-https"
204-
network = local.target_vpc_name
205-
206-
allow {
207-
protocol = "tcp"
208-
ports = [tonumber("5${var.module_var_sap_hana_instance_no}14")]
209-
}
210-
211-
direction = "INGRESS"
212-
# destination_ranges =
213-
source_ranges = ["${local.target_vpc_subnet_range}"]
214-
}
215-
resource "google_compute_firewall" "vpc_fw_rule_tcp_egress_saphana_startsrv_https_soap" {
216-
count = local.network_rules_sap_hana_boolean ? 1 : 0
217-
name = "${var.module_var_resource_prefix}-vpc-fw-egress-saphana-startsrv-https"
218-
network = local.target_vpc_name
219-
220-
allow {
221-
protocol = "tcp"
222-
ports = [tonumber("5${var.module_var_sap_hana_instance_no}14")]
192+
ports = ["5${var.module_var_sap_hana_instance_no}13-5${var.module_var_sap_hana_instance_no}14"]
223193
}
224194

225195
direction = "EGRESS"

‎ibmcloud_vs/bastion_inject/bastion_provision.tf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ resource "ibm_is_floating_ip" "bastion_floating_ip" {
4949

5050
resource "null_resource" "bastion_ssh_configure" {
5151

52-
depends_on = [ibm_is_instance.bastion_host]
52+
depends_on = [
53+
ibm_is_instance.bastion_host,
54+
ibm_is_floating_ip.bastion_floating_ip
55+
]
5356

5457
# Virtual Server Private Key apply file permissions
5558
provisioner "remote-exec" {

‎ibmcloud_vs/host_network_access_sap/network_security_groups_sap_hana.tf

Lines changed: 4 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ resource "ibm_is_security_group_rule" "vpc_sg_rule_tcp_outbound_saphana_index_md
123123

124124

125125
# SAP HANA for SOAP over HTTP for SAP Instance Agent (SAPStartSrv, i.e. host:port/SAPControl?wsdl), access from within the same Subnet
126+
# SAP HANA for SOAP over HTTPS (Secure) for SAP Instance Agent (SAPStartSrv, i.e. host:port/SAPControl?wsdl), access from within the same Subnet
126127
resource "ibm_is_security_group_rule" "vpc_sg_rule_tcp_inbound_saphana_startsrv_http_soap" {
127128
count = local.network_rules_sap_hana_boolean ? 1 : 0
128129
depends_on = [ibm_is_security_group_rule.vpc_sg_rule_tcp_inbound_saphana_index_mdc_1]
@@ -131,42 +132,17 @@ resource "ibm_is_security_group_rule" "vpc_sg_rule_tcp_inbound_saphana_startsrv_
131132
remote = local.target_vpc_subnet_range
132133
tcp {
133134
port_min = tonumber("5${var.module_var_sap_hana_instance_no}13")
134-
port_max = tonumber("5${var.module_var_sap_hana_instance_no}13")
135-
}
136-
}
137-
resource "ibm_is_security_group_rule" "vpc_sg_rule_tcp_outbound_saphana_startsrv_http_soap" {
138-
count = local.network_rules_sap_hana_boolean ? 1 : 0
139-
depends_on = [ibm_is_security_group_rule.vpc_sg_rule_tcp_inbound_saphana_index_mdc_1]
140-
group = var.module_var_host_security_group_id
141-
direction = "outbound"
142-
remote = local.target_vpc_subnet_range
143-
tcp {
144-
port_min = tonumber("5${var.module_var_sap_hana_instance_no}13")
145-
port_max = tonumber("5${var.module_var_sap_hana_instance_no}13")
146-
}
147-
}
148-
149-
150-
# SAP HANA for SOAP over HTTPS (Secure) for SAP Instance Agent (SAPStartSrv, i.e. host:port/SAPControl?wsdl), access from within the same Subnet
151-
resource "ibm_is_security_group_rule" "vpc_sg_rule_tcp_inbound_saphana_startsrv_https_soap" {
152-
count = local.network_rules_sap_hana_boolean ? 1 : 0
153-
depends_on = [ibm_is_security_group_rule.vpc_sg_rule_tcp_inbound_saphana_startsrv_http_soap]
154-
group = var.module_var_host_security_group_id
155-
direction = "inbound"
156-
remote = local.target_vpc_subnet_range
157-
tcp {
158-
port_min = tonumber("5${var.module_var_sap_hana_instance_no}14")
159135
port_max = tonumber("5${var.module_var_sap_hana_instance_no}14")
160136
}
161137
}
162-
resource "ibm_is_security_group_rule" "vpc_sg_rule_tcp_outbound_saphana_startsrv_https_soap" {
138+
resource "ibm_is_security_group_rule" "vpc_sg_rule_tcp_outbound_saphana_startsrv_http_soap" {
163139
count = local.network_rules_sap_hana_boolean ? 1 : 0
164140
depends_on = [ibm_is_security_group_rule.vpc_sg_rule_tcp_inbound_saphana_startsrv_http_soap]
165141
group = var.module_var_host_security_group_id
166142
direction = "outbound"
167143
remote = local.target_vpc_subnet_range
168144
tcp {
169-
port_min = tonumber("5${var.module_var_sap_hana_instance_no}14")
145+
port_min = tonumber("5${var.module_var_sap_hana_instance_no}13")
170146
port_max = tonumber("5${var.module_var_sap_hana_instance_no}14")
171147
}
172148
}
@@ -178,7 +154,7 @@ resource "ibm_is_security_group_rule" "vpc_sg_rule_tcp_outbound_saphana_startsrv
178154
## More details in README
179155
resource "ibm_is_security_group_rule" "vpc_sg_rule_sap_inbound_saphana_hsr1" {
180156
count = local.network_rules_sap_hana_boolean ? 1 : 0
181-
depends_on = [ibm_is_security_group_rule.vpc_sg_rule_tcp_inbound_saphana_startsrv_https_soap]
157+
depends_on = [ibm_is_security_group_rule.vpc_sg_rule_tcp_outbound_saphana_startsrv_http_soap]
182158
group = var.module_var_host_security_group_id
183159
direction = "inbound"
184160
remote = local.target_vpc_subnet_range

‎ibmcloud_vs/host_provision/build_dns_update.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ EOF
8282
# Checking Host Key is false when not using bastion_host_key
8383
type = "ssh"
8484
user = "root"
85-
host = ibm_is_instance.virtual_server.primary_network_interface[0].primary_ipv4_address
85+
host = ibm_is_instance.virtual_server.primary_network_interface[0].primary_ip[0].address
8686
private_key = var.module_var_host_private_ssh_key
8787
bastion_host = var.module_var_bastion_floating_ip
8888
#bastion_host_key =
@@ -116,7 +116,7 @@ resource "null_resource" "dns_resolv_update" {
116116
# Checking Host Key is false when not using bastion_host_key
117117
type = "ssh"
118118
user = "root"
119-
host = ibm_is_instance.virtual_server.primary_network_interface[0].primary_ipv4_address
119+
host = ibm_is_instance.virtual_server.primary_network_interface[0].primary_ip[0].address
120120
private_key = var.module_var_host_private_ssh_key
121121
bastion_host = var.module_var_bastion_floating_ip
122122
bastion_port = var.module_var_bastion_ssh_port

‎ibmcloud_vs/host_provision/build_execution.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ resource "null_resource" "execute_os_scripts" {
1515
# Checking Host Key is false when not using bastion_host_key
1616
type = "ssh"
1717
user = "root"
18-
host = ibm_is_instance.virtual_server.primary_network_interface[0].primary_ipv4_address
18+
host = ibm_is_instance.virtual_server.primary_network_interface[0].primary_ip[0].address
1919
private_key = var.module_var_host_private_ssh_key
2020
bastion_host = var.module_var_bastion_floating_ip
2121
bastion_port = var.module_var_bastion_ssh_port
@@ -47,7 +47,7 @@ resource "null_resource" "execute_os_scripts" {
4747

4848
# Copy logs back to the Terraform origin/local host
4949
#provisioner "local-exec" {
50-
# command = "scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand='ssh -W %h:%p bastionuser@${var.module_var_bastion_floating_ip} -p ${var.module_var_bastion_ssh_port} -i ${path.root}/ssh/bastion_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' -i ${path.root}/ssh/hosts_rsa root@${ibm_is_instance.virtual_server.primary_network_interface[0].primary_ipv4_address}:/tmp/terraform_shell_logs_*.zip ${path.root}"
50+
# command = "scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o ProxyCommand='ssh -W %h:%p bastionuser@${var.module_var_bastion_floating_ip} -p ${var.module_var_bastion_ssh_port} -i ${path.root}/ssh/bastion_rsa -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' -i ${path.root}/ssh/hosts_rsa root@${ibm_is_instance.virtual_server.primary_network_interface[0].primary_ip[0].address}:/tmp/terraform_shell_logs_*.zip ${path.root}"
5151
#}
5252

5353
}

0 commit comments

Comments
 (0)