Skip to content

Commit 2d46352

Browse files
ocofaighocofaigh
authored
fix: fix the VSI quickstart pattern where new variables were incorrectly introduced (#548)
1 parent 058f423 commit 2d46352

File tree

3 files changed

+11
-645
lines changed

3 files changed

+11
-645
lines changed

‎patterns/vsi-quickstart/main.tf‎

Lines changed: 8 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -2,70 +2,12 @@
22
# QuickStart VSI Landing Zone
33
##############################################################################
44

5-
module "quickstart_landing_zone" {
6-
source = "../vsi"
7-
ibmcloud_api_key = var.ibmcloud_api_key
8-
prefix = var.prefix
9-
region = var.region
10-
ssh_public_key = var.ssh_key
11-
existing_ssh_key_name = var.existing_ssh_key_name
12-
tags = var.resource_tags
13-
network_cidr = var.network_cidr
14-
vpcs = var.vpcs
15-
enable_transit_gateway = var.enable_transit_gateway
16-
add_atracker_route = var.add_atracker_route
17-
hs_crypto_instance_name = var.hs_crypto_instance_name
18-
hs_crypto_resource_group = var.hs_crypto_resource_group
19-
use_random_cos_suffix = var.use_random_cos_suffix
20-
vsi_image_name = var.vsi_image_name
21-
vsi_instance_profile = var.vsi_instance_profile
22-
vsi_per_subnet = var.vsi_per_subnet
23-
add_edge_vpc = var.add_edge_vpc
24-
create_f5_network_on_management_vpc = var.create_f5_network_on_management_vpc
25-
provision_teleport_in_f5 = var.provision_teleport_in_f5
26-
vpn_firewall_type = var.vpn_firewall_type
27-
f5_image_name = var.f5_image_name
28-
f5_instance_profile = var.f5_instance_profile
29-
hostname = var.hostname
30-
domain = var.domain
31-
tmos_admin_password = var.tmos_admin_password
32-
license_type = var.license_type
33-
byol_license_basekey = var.byol_license_basekey
34-
license_host = var.license_host
35-
license_username = var.license_username
36-
license_password = var.license_password
37-
license_pool = var.license_pool
38-
license_sku_keyword_1 = var.license_sku_keyword_1
39-
license_sku_keyword_2 = var.license_sku_keyword_2
40-
license_unit_of_measure = var.license_unit_of_measure
41-
do_declaration_url = var.do_declaration_url
42-
as3_declaration_url = var.as3_declaration_url
43-
ts_declaration_url = var.ts_declaration_url
44-
phone_home_url = var.phone_home_url
45-
template_source = var.template_source
46-
template_version = var.template_version
47-
app_id = var.app_id
48-
tgactive_url = var.tgactive_url
49-
tgstandby_url = var.tgstandby_url
50-
tgrefresh_url = var.tgrefresh_url
51-
enable_f5_management_fip = var.enable_f5_management_fip
52-
enable_f5_external_fip = var.enable_f5_external_fip
53-
teleport_management_zones = var.teleport_management_zones
54-
use_existing_appid = var.use_existing_appid
55-
appid_name = var.appid_name
56-
appid_resource_group = var.appid_resource_group
57-
teleport_instance_profile = var.teleport_instance_profile
58-
teleport_vsi_image_name = var.teleport_vsi_image_name
59-
teleport_license = var.teleport_license
60-
https_cert = var.https_cert
61-
https_key = var.https_key
62-
teleport_hostname = var.teleport_hostname
63-
teleport_domain = var.teleport_domain
64-
teleport_version = var.teleport_version
65-
message_of_the_day = var.message_of_the_day
66-
teleport_admin_email = var.teleport_admin_email
67-
create_secrets_manager = var.create_secrets_manager
68-
add_kms_block_storage_s2s = var.add_kms_block_storage_s2s
69-
override = var.override
70-
override_json_string = var.override_json_string
5+
module "landing_zone" {
6+
source = "../vsi/module"
7+
prefix = var.prefix
8+
region = var.region
9+
ibmcloud_api_key = var.ibmcloud_api_key
10+
ssh_public_key = var.ssh_key
11+
override_json_string = var.override_json_string
12+
tags = var.resource_tags
7113
}

‎patterns/vsi-quickstart/outputs.tf‎

Lines changed: 1 addition & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,8 @@
11
##############################################################################
22
# Output Variables
33
##############################################################################
4-
output "landing_zone" {
5-
value = module.quickstart_landing_zone
6-
description = "Landing zone configuration"
7-
}
8-
9-
output "prefix" {
10-
description = "The prefix that is associated with all resources"
11-
value = var.prefix
12-
}
13-
14-
output "resource_group_names" {
15-
description = "List of resource groups names used within landing zone."
16-
value = module.quickstart_landing_zone.resource_group_names
17-
}
18-
19-
output "resource_group_data" {
20-
description = "List of resource groups data used within landing zone."
21-
value = module.quickstart_landing_zone.resource_group_data
22-
}
23-
24-
output "vpc_names" {
25-
description = "A list of the names of the VPC"
26-
value = module.quickstart_landing_zone.vpc_names
27-
}
28-
29-
output "vpc_data" {
30-
description = "List of VPC data"
31-
value = module.quickstart_landing_zone.vpc_data
32-
}
33-
34-
output "subnet_data" {
35-
description = "List of Subnet data created"
36-
value = module.quickstart_landing_zone.subnet_data
37-
}
38-
39-
output "vsi_names" {
40-
description = "A list of the vsis names provisioned within the VPCs"
41-
value = module.quickstart_landing_zone.vsi_names
42-
}
43-
44-
output "transit_gateway_name" {
45-
description = "The name of the transit gateway"
46-
value = module.quickstart_landing_zone.transit_gateway_name
47-
}
48-
49-
output "transit_gateway_data" {
50-
description = "Created transit gateway data"
51-
value = module.quickstart_landing_zone.transit_gateway_data
52-
}
53-
54-
output "ssh_key" {
55-
description = "The string value of the ssh public key"
56-
value = var.ssh_key
57-
}
58-
59-
output "ssh_key_data" {
60-
description = "List of SSH key data"
61-
value = module.quickstart_landing_zone.ssh_key_data
62-
}
63-
64-
output "fip_vsi" {
65-
description = "A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP. This list only contains instances with a floating IP attached."
66-
value = module.quickstart_landing_zone.fip_vsi
67-
}
68-
69-
output "vsi_list" {
70-
description = "A list of VSI with name, id, zone, and primary ipv4 address, VPC Name, and floating IP."
71-
value = module.quickstart_landing_zone.vsi_list
72-
}
73-
74-
output "cos_data" {
75-
description = "List of Cloud Object Storage instance data"
76-
value = module.quickstart_landing_zone.cos_data
77-
}
78-
79-
output "cos_bucket_data" {
80-
description = "List of data for COS buckets created"
81-
value = module.quickstart_landing_zone.cos_bucket_data
82-
}
83-
84-
output "vpn_data" {
85-
description = "List of VPN data"
86-
value = module.quickstart_landing_zone.vpn_data
87-
}
88-
89-
##############################################################################
90-
91-
##############################################################################
92-
# Schematics Output
93-
##############################################################################
94-
95-
output "schematics_workspace_id" {
96-
description = "ID of the IBM Cloud Schematics workspace. Returns null if not ran in Schematics"
97-
value = var.IC_SCHEMATICS_WORKSPACE_ID
98-
}
99-
100-
##############################################################################
101-
102-
##############################################################################
103-
# Output Configuration
104-
##############################################################################
1054

1065
output "config" {
1076
description = "Output configuration as encoded JSON"
108-
value = module.quickstart_landing_zone.config
7+
value = module.landing_zone.config
1098
}
110-
111-
##############################################################################

0 commit comments

Comments
 (0)