Skip to content

Commit 33eb411

Browse files
authored
reversed 1.3.0 and 1.3.11 (#70)
1 parent d5c2dea commit 33eb411

File tree

5 files changed

+18
-7
lines changed

5 files changed

+18
-7
lines changed

CHANGELOG.adoc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +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+
== 1.4.0 (Sep 1, 2020)
11+
* Reverses 1.3.0 and 1.3.11 (#69)
12+
* Upgraded bastion module to 1.0.7
13+
* Upgraded operator module to 1.0.13
14+
1015
== 1.3.1 (August 5, 2020)
1116
* Upgraded operator module to 1.0.12 (#67)
1217

docs/terraformoptions.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Configuration Terraform Options:
155155

156156
|bastion_access
157157
|CIDR block in the form of a string to which ssh access to the bastion must be restricted to. *_ANYWHERE_* is equivalent to 0.0.0.0/0 and allows ssh access from anywhere.
158-
|XXX.XXX.XXX.XXX/YY
158+
|XYZ.XYZ.XYZ.XYZ/YY
159159
|ANYWHERE
160160

161161
|bastion_enabled

main.tf

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,18 @@ module "vcn" {
2424

2525
module "bastion" {
2626
source = "oracle-terraform-modules/bastion/oci"
27-
version = "1.0.6"
27+
version = "1.0.7"
2828

29+
# provider identity parameters
30+
api_fingerprint = var.oci_base_provider.api_fingerprint
31+
api_private_key_path = var.oci_base_provider.api_private_key_path
2932
region = var.oci_base_provider.region
33+
tenancy_id = var.oci_base_provider.tenancy_id
34+
user_id = var.oci_base_provider.user_id
3035

3136
# general oci parameters
3237
compartment_id = var.oci_base_general.compartment_id
3338
label_prefix = var.oci_base_general.label_prefix
34-
root_compartment_id = var.oci_base_provider.tenancy_id
3539

3640
# network parameters
3741

@@ -64,14 +68,18 @@ module "bastion" {
6468

6569
module "operator" {
6670
source = "oracle-terraform-modules/operator/oci"
67-
version = "1.0.12"
71+
version = "1.0.13"
6872

73+
# provider identity parameters
74+
api_fingerprint = var.oci_base_provider.api_fingerprint
75+
api_private_key_path = var.oci_base_provider.api_private_key_path
6976
region = var.oci_base_provider.region
77+
tenancy_id = var.oci_base_provider.tenancy_id
78+
user_id = var.oci_base_provider.user_id
7079

7180
# general oci parameters
7281
compartment_id = var.oci_base_general.compartment_id
7382
label_prefix = var.oci_base_general.label_prefix
74-
root_compartment_id = var.oci_base_provider.tenancy_id
7583

7684
# network parameters
7785
availability_domain = var.oci_base_operator.availability_domain

terraform.tfvars.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ oci_base_provider = {
1313
oci_base_general = {
1414
compartment_id = ""
1515
label_prefix = "dev"
16-
root_compartment_id = ""
1716
}
1817

1918
# networking

variables.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ variable "oci_base_general" {
2020
type = object({
2121
compartment_id = string
2222
label_prefix = string
23-
root_compartment_id = string
2423
})
2524
description = "general oci parameters"
2625
}

0 commit comments

Comments
 (0)