Skip to content

Commit ad76dd9

Browse files
committed
fix: Bastion & FSS support for disabled VCN DNS, min TF version -> 1.1
Signed-off-by: Devon Crouse <[email protected]>
1 parent 7d20404 commit ad76dd9

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

CHANGELOG.adoc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ All notable changes to this project are documented in this file.
77

88
The format is based on {uri-changelog}[Keep a Changelog].
99

10-
== 4.2.17 (not released)
10+
== 4.2.18 (not released)
11+
=== Changes
12+
* fix: Bastion & FSS support for disabled VCN DNS, min TF version -> 1.1 by @devoncrouse
13+
14+
== 4.2.17
1115
=== Changes
1216
* fix: Operator support for disabled VCN DNS by @devoncrouse in #614
1317

main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@ module "drg" {
5959

6060
module "bastion" {
6161
source = "oracle-terraform-modules/bastion/oci"
62-
version = "3.1.3"
62+
version = "3.1.5"
6363

6464
tenancy_id = local.tenancy_id
6565
compartment_id = local.compartment_id
6666

6767
label_prefix = var.label_prefix
6868

6969
# networking
70+
assign_dns = var.assign_dns
7071
availability_domain = var.availability_domains["bastion"]
7172
bastion_access = var.bastion_access
7273
ig_route_id = local.ig_route_id

modules/storage/fss.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ resource "oci_file_storage_mount_target" "fss_mount_target" {
1717
compartment_id = var.compartment_id
1818
subnet_id = oci_core_subnet.fss.id
1919
display_name = var.label_prefix == "none" ? "fss-mt" : "${var.label_prefix}-fss-mt"
20-
hostname_label = "fss-mt"
20+
hostname_label = var.assign_dns ? "fss-mt" : null
2121
nsg_ids = [oci_core_network_security_group.fss_mt.id]
2222

2323
lifecycle {

versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2017, 2021, Oracle Corporation and/or affiliates.
1+
# Copyright 2017, 2022 Oracle Corporation and/or affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl
33

44
terraform {
@@ -9,5 +9,5 @@ terraform {
99
version = ">= 4.67.3"
1010
}
1111
}
12-
required_version = ">= 1.0.0"
12+
required_version = ">= 1.1.0"
1313
}

0 commit comments

Comments
 (0)