Skip to content

Commit c897f5a

Browse files
authored
Merge pull request #23 from sap-linuxlab/dev
fix: switch to tf mods main branch until gh action webhook created
2 parents 2b6889c + 090609b commit c897f5a

File tree

59 files changed

+509
-509
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+509
-509
lines changed

sap_bw4hana_single_node_install/aws_ec2_instance/main.tf

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
module "run_ansible_dry_run" {
33

4-
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=0.7.0"
4+
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
55

66
module_var_dry_run_test = "x86_64" // x86_64 or ppc64le
77

@@ -32,7 +32,7 @@ module "run_account_init_module" {
3232
module.run_ansible_dry_run
3333
]
3434

35-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/account_init?ref=0.7.0"
35+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/account_init?ref=main"
3636

3737
module_var_resource_prefix = var.resource_prefix
3838

@@ -51,7 +51,7 @@ module "run_account_bootstrap_module" {
5151
module.run_account_init_module
5252
]
5353

54-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/account_bootstrap?ref=0.7.0"
54+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/account_bootstrap?ref=main"
5555

5656
module_var_resource_prefix = var.resource_prefix
5757

@@ -75,7 +75,7 @@ module "run_bastion_inject_module" {
7575
module.run_account_bootstrap_module
7676
]
7777

78-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/bastion_inject?ref=0.7.0"
78+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/bastion_inject?ref=main"
7979

8080
module_var_resource_prefix = var.resource_prefix
8181

@@ -100,7 +100,7 @@ module "run_host_network_access_sap_module" {
100100
module.run_bastion_inject_module
101101
]
102102

103-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/host_network_access_sap?ref=0.7.0"
103+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/host_network_access_sap?ref=main"
104104

105105
module_var_resource_prefix = var.resource_prefix
106106

@@ -118,7 +118,7 @@ module "run_host_network_access_sap_public_via_proxy_module" {
118118
module.run_bastion_inject_module
119119
]
120120

121-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/host_network_access_sap_public_via_proxy?ref=0.7.0"
121+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/host_network_access_sap_public_via_proxy?ref=main"
122122

123123
module_var_resource_prefix = var.resource_prefix
124124

@@ -140,7 +140,7 @@ module "run_host_provision_module" {
140140
module.run_bastion_inject_module
141141
]
142142

143-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/host_provision?ref=0.7.0"
143+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//aws_ec2_instance/host_provision?ref=main"
144144

145145
# Set Terraform Module Variables using Terraform Variables at runtime
146146

@@ -251,7 +251,7 @@ module "run_ansible_sap_bw4hana_install" {
251251

252252
depends_on = [module.run_host_provision_module]
253253

254-
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=0.7.0"
254+
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
255255

256256
# Terraform Module Variables using the prior Terraform Module Variables (from bootstrap module)
257257
module_var_bastion_boolean = true // required as true boolean for any Cloud Service Provider (CSP)

sap_bw4hana_single_node_install/ibmcloud_powervs/main.tf

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
module "run_ansible_dry_run" {
33

4-
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=0.7.0"
4+
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
55

66
module_var_dry_run_test = "x86_64" // x86_64 or ppc64le
77

@@ -32,7 +32,7 @@ module "run_account_init_module" {
3232
module.run_ansible_dry_run
3333
]
3434

35-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_init?ref=0.7.0"
35+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_init?ref=main"
3636

3737
module_var_resource_group_name = local.resource_group_create_boolean ? 0 : var.ibmcloud_resource_group
3838
module_var_resource_group_create_boolean = local.resource_group_create_boolean
@@ -52,7 +52,7 @@ module "run_account_bootstrap_module" {
5252
module.run_account_init_module
5353
]
5454

55-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_bootstrap?ref=0.7.0"
55+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_bootstrap?ref=main"
5656

5757
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
5858
module_var_resource_prefix = var.resource_prefix
@@ -74,7 +74,7 @@ module "run_account_iam_module" {
7474

7575
count = var.ibmcloud_iam_yesno == "yes" ? 1 : 0
7676

77-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_iam?ref=0.7.0"
77+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_iam?ref=main"
7878

7979
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
8080
module_var_resource_prefix = var.resource_prefix
@@ -89,7 +89,7 @@ module "run_bastion_inject_module" {
8989
module.run_account_bootstrap_module
9090
]
9191

92-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/bastion_inject?ref=0.7.0"
92+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/bastion_inject?ref=main"
9393

9494
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
9595
module_var_resource_prefix = var.resource_prefix
@@ -116,7 +116,7 @@ module "run_host_network_access_sap_public_via_proxy_module" {
116116
module.run_bastion_inject_module
117117
]
118118

119-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/host_network_access_sap_public_via_proxy?ref=0.7.0"
119+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/host_network_access_sap_public_via_proxy?ref=main"
120120

121121
module_var_ibmcloud_vpc_subnet_name = local.ibmcloud_vpc_subnet_create_boolean ? module.run_account_init_module.output_vpc_subnet_name : var.ibmcloud_vpc_subnet_name
122122

@@ -136,7 +136,7 @@ module "run_powervs_account_bootstrap_module" {
136136
module.run_account_bootstrap_module
137137
]
138138

139-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_addon?ref=0.7.0"
139+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/account_bootstrap_addon?ref=main"
140140

141141
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
142142
module_var_resource_prefix = var.resource_prefix
@@ -153,7 +153,7 @@ module "run_powervs_interconnect_sg_update_module" {
153153
module.run_powervs_account_bootstrap_module
154154
]
155155

156-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/powervs_interconnect_sg_update?ref=0.7.0"
156+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/powervs_interconnect_sg_update?ref=main"
157157

158158
module_var_bastion_security_group_id = module.run_bastion_inject_module.output_bastion_security_group_id
159159
module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id
@@ -172,7 +172,7 @@ module "run_powervs_interconnect_proxy_provision_module" {
172172
module.run_powervs_interconnect_sg_update_module
173173
]
174174

175-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/powervs_interconnect_proxy_provision?ref=0.7.0"
175+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/powervs_interconnect_proxy_provision?ref=main"
176176

177177
# Set Terraform Module Variables using Terraform Variables at runtime
178178

@@ -216,7 +216,7 @@ module "run_host_provision_module" {
216216
module.run_powervs_interconnect_proxy_provision_module
217217
]
218218

219-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=0.7.0"
219+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_powervs/host_provision?ref=main"
220220

221221
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
222222
module_var_resource_prefix = var.resource_prefix
@@ -329,7 +329,7 @@ module "run_ansible_sap_bw4hana_install" {
329329

330330
depends_on = [module.run_host_provision_module]
331331

332-
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=0.7.0"
332+
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
333333

334334
# Terraform Module Variables using the prior Terraform Module Variables (from bootstrap module)
335335
module_var_bastion_boolean = true // required as true boolean for any Cloud Service Provider (CSP)

sap_bw4hana_single_node_install/ibmcloud_vs/main.tf

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
module "run_ansible_dry_run" {
33

4-
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=0.7.0"
4+
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
55

66
module_var_dry_run_test = "x86_64" // x86_64 or ppc64le
77

@@ -32,7 +32,7 @@ module "run_account_init_module" {
3232
module.run_ansible_dry_run
3333
]
3434

35-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_init?ref=0.7.0"
35+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_init?ref=main"
3636

3737
module_var_resource_group_name = local.resource_group_create_boolean ? 0 : var.ibmcloud_resource_group
3838
module_var_resource_group_create_boolean = local.resource_group_create_boolean
@@ -52,7 +52,7 @@ module "run_account_bootstrap_module" {
5252
module.run_account_init_module
5353
]
5454

55-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_bootstrap?ref=0.7.0"
55+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_bootstrap?ref=main"
5656

5757
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
5858
module_var_resource_prefix = var.resource_prefix
@@ -74,7 +74,7 @@ module "run_account_iam_module" {
7474

7575
count = var.ibmcloud_iam_yesno == "yes" ? 1 : 0
7676

77-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_iam?ref=0.7.0"
77+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/account_iam?ref=main"
7878

7979
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
8080
module_var_resource_prefix = var.resource_prefix
@@ -89,7 +89,7 @@ module "run_bastion_inject_module" {
8989
module.run_account_bootstrap_module
9090
]
9191

92-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/bastion_inject?ref=0.7.0"
92+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/bastion_inject?ref=main"
9393

9494
module_var_resource_group_id = module.run_account_init_module.output_resource_group_id
9595
module_var_resource_prefix = var.resource_prefix
@@ -116,7 +116,7 @@ module "run_host_network_access_sap_module" {
116116
module.run_bastion_inject_module
117117
]
118118

119-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/host_network_access_sap?ref=0.7.0"
119+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/host_network_access_sap?ref=main"
120120

121121
module_var_ibmcloud_vpc_subnet_name = local.ibmcloud_vpc_subnet_create_boolean ? module.run_account_init_module.output_vpc_subnet_name : var.ibmcloud_vpc_subnet_name
122122
module_var_host_security_group_id = module.run_account_bootstrap_module.output_host_security_group_id
@@ -135,7 +135,7 @@ module "run_host_network_access_sap_public_via_proxy_module" {
135135
module.run_bastion_inject_module
136136
]
137137

138-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/host_network_access_sap_public_via_proxy?ref=0.7.0"
138+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/host_network_access_sap_public_via_proxy?ref=main"
139139

140140
module_var_ibmcloud_vpc_subnet_name = local.ibmcloud_vpc_subnet_create_boolean ? module.run_account_init_module.output_vpc_subnet_name : var.ibmcloud_vpc_subnet_name
141141

@@ -157,7 +157,7 @@ module "run_host_provision_module" {
157157
module.run_bastion_inject_module
158158
]
159159

160-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/host_provision?ref=0.7.0"
160+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmcloud_vs/host_provision?ref=main"
161161

162162
# Set Terraform Module Variables using Terraform Variables at runtime
163163

@@ -272,7 +272,7 @@ module "run_ansible_sap_bw4hana_install" {
272272

273273
depends_on = [module.run_host_provision_module]
274274

275-
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=0.7.0"
275+
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
276276

277277
# Terraform Module Variables using the prior Terraform Module Variables (from bootstrap module)
278278
module_var_bastion_boolean = true // required as true boolean for any Cloud Service Provider (CSP)

sap_bw4hana_single_node_install/ibmpowervc/main.tf

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
module "run_ansible_dry_run" {
33

4-
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=0.7.0"
4+
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
55

66
module_var_dry_run_test = "x86_64" // x86_64 or ppc64le
77

@@ -32,7 +32,7 @@ module "run_host_bootstrap_module" {
3232
module.run_ansible_dry_run
3333
]
3434

35-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmpowervc/host_bootstrap?ref=0.7.0"
35+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmpowervc/host_bootstrap?ref=main"
3636

3737
# Set Terraform Module Variables using Terraform Variables at runtime
3838
module_var_resource_prefix = var.resource_prefix
@@ -42,7 +42,7 @@ module "run_host_bootstrap_module" {
4242

4343
module "run_host_provision_module" {
4444

45-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmpowervc/host_provision?ref=0.7.0"
45+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//ibmpowervc/host_provision?ref=main"
4646

4747
# Set Terraform Module Variables using Terraform Variables at runtime
4848

@@ -148,7 +148,7 @@ module "run_ansible_sap_bw4hana_install" {
148148

149149
depends_on = [module.run_host_provision_module]
150150

151-
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=0.7.0"
151+
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
152152

153153
# Terraform Module Variables using the prior Terraform Module Variables (from bootstrap module)
154154
module_var_bastion_boolean = var.bastion_boolean

sap_bw4hana_single_node_install/msazure_vm/main.tf

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
module "run_ansible_dry_run" {
33

4-
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=0.7.0"
4+
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
55

66
module_var_dry_run_test = "x86_64" // x86_64 or ppc64le
77

@@ -32,7 +32,7 @@ module "run_account_init_module" {
3232
module.run_ansible_dry_run
3333
]
3434

35-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/account_init?ref=0.7.0"
35+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/account_init?ref=main"
3636

3737
module_var_az_resource_group_name = local.resource_group_create_boolean ? 0 : var.az_resource_group_name
3838
module_var_az_resource_group_create_boolean = local.resource_group_create_boolean
@@ -57,7 +57,7 @@ module "run_account_bootstrap_module" {
5757
module.run_account_init_module
5858
]
5959

60-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/account_bootstrap?ref=0.7.0"
60+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/account_bootstrap?ref=main"
6161

6262
module_var_az_resource_group_name = module.run_account_init_module.output_resource_group_name
6363
module_var_resource_prefix = var.resource_prefix
@@ -80,7 +80,7 @@ module "run_account_bootstrap_module" {
8080
#
8181
# count = var.az_iam_yesno == "yes" ? 1 : 0
8282
#
83-
# source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/account_iam?ref=0.7.0"
83+
# source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/account_iam?ref=main"
8484
#
8585
# module_var_az_resource_group_name = module.run_account_init_module.output_resource_group_name
8686
# module_var_resource_prefix = var.resource_prefix
@@ -95,7 +95,7 @@ module "run_bastion_inject_module" {
9595
module.run_account_bootstrap_module
9696
]
9797

98-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/bastion_inject?ref=0.7.0"
98+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/bastion_inject?ref=main"
9999

100100
module_var_az_resource_group_name = module.run_account_init_module.output_resource_group_name
101101
module_var_resource_prefix = var.resource_prefix
@@ -125,7 +125,7 @@ module "run_host_network_access_sap_module" {
125125
module.run_bastion_inject_module
126126
]
127127

128-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/host_network_access_sap?ref=0.7.0"
128+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/host_network_access_sap?ref=main"
129129

130130
module_var_az_resource_group_name = module.run_account_init_module.output_resource_group_name
131131

@@ -145,7 +145,7 @@ module "run_host_network_access_sap_public_via_proxy_module" {
145145
module.run_bastion_inject_module
146146
]
147147

148-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/host_network_access_sap_public_via_proxy?ref=0.7.0"
148+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/host_network_access_sap_public_via_proxy?ref=main"
149149

150150
module_var_az_resource_group_name = module.run_account_init_module.output_resource_group_name
151151

@@ -171,7 +171,7 @@ module "run_host_provision_module" {
171171
module.run_bastion_inject_module
172172
]
173173

174-
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/host_provision?ref=0.7.0"
174+
source = "github.com/sap-linuxlab/terraform.modules_for_sap//msazure_vm/host_provision?ref=main"
175175

176176

177177
module_var_az_resource_group_name = module.run_account_init_module.output_resource_group_name
@@ -285,7 +285,7 @@ module "run_ansible_sap_bw4hana_install" {
285285

286286
depends_on = [module.run_host_provision_module]
287287

288-
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=0.7.0"
288+
source = "github.com/sap-linuxlab/terraform.modules_for_sap.git//all/ansible_sap_bw4hana_install?ref=main"
289289

290290
# Terraform Module Variables using the prior Terraform Module Variables (from bootstrap module)
291291
module_var_bastion_boolean = true // required as true boolean for any Cloud Service Provider (CSP)

0 commit comments

Comments
 (0)