Skip to content

Commit 7b06aa3

Browse files
authored
reversed 1.0.10 and 1.0.11 (#15)
1 parent e4710da commit 7b06aa3

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

CHANGELOG.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ 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+
== v1.0.13 (August 31,2020)
11+
* Removed root_compartment_id
12+
1013
== v1.0.12 (August 19,2020)
1114

1215
=== Changes

datasources.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
data "oci_identity_availability_domains" "ad_list" {
5-
compartment_id = var.root_compartment_id
5+
compartment_id = var.tenancy_id
66
}
77

88
data "template_file" "ad_names" {
@@ -11,7 +11,7 @@ data "template_file" "ad_names" {
1111
}
1212

1313
data "oci_identity_tenancy" "tenancy" {
14-
tenancy_id = var.root_compartment_id
14+
tenancy_id = var.tenancy_id
1515
}
1616

1717
# get the tenancy's home region

instance_principal.tf

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@
44
# create a home region provider for identity operations
55
provider "oci" {
66
alias = "home"
7+
fingerprint = var.api_fingerprint
8+
private_key_path = var.api_private_key_path
79
region = lookup(data.oci_identity_regions.home_region.regions[0], "name")
10+
tenancy_ocid = var.tenancy_id
11+
user_ocid = var.user_id
812
}
913

1014
resource "oci_identity_dynamic_group" "operator_instance_principal" {
1115
provider = oci.home
1216

13-
compartment_id = var.root_compartment_id
17+
compartment_id = var.tenancy_id
1418
description = "dynamic group to allow instances to call services for 1 operator"
1519
matching_rule = "ALL {instance.id = '${join(",", data.oci_core_instance.operator.*.id)}'}"
1620
name = var.label_prefix == "none" ? "operator-instance-principal" : "${var.label_prefix}-operator-instance-principal"

variables.tf

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ variable "label_prefix" {
4545
default = "none"
4646
}
4747

48-
variable "root_compartment_id" {
49-
# specify a different name so it can be used in resource manager
50-
description = "tenancy id where to create the sources"
51-
type = string
52-
}
53-
5448
# network parameters
5549

5650
variable "availability_domain" {

0 commit comments

Comments
 (0)