Reversed 1.04 and and 1.0.5 (#10)

* reversed 1.0.4 and 1.0.5

* doc changes and tenancy in ons

Author: hyder

CHANGELOG.adoc

@@ -7,6 +7,9 @@ All notable changes to this project are documented in this file.
 
 The format is based on {uri-changelog}[Keep a Changelog].
 
+= v1.0.6 (August 31,2020)
+* Reversed 1.0.4 and 1.0.5 (#9)
+
 == v1.0.5 (August 5,2020)
 * tenancy id is needed for list of ADs (#7)
 

datasources.tf

@@ -2,7 +2,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 data "oci_identity_availability_domains" "ad_list" {
-  compartment_id = var.root_compartment_id
+  compartment_id = var.tenancy_id
 }
 
 data "template_file" "ad_names" {
@@ -11,7 +11,7 @@ data "template_file" "ad_names" {
 }
 
 data "oci_identity_tenancy" "tenancy" {
-  tenancy_id = var.root_compartment_id
+  tenancy_id = var.tenancy_id
 }
 
 # get the tenancy's home region

docs/terraformoptions.adoc

@@ -196,7 +196,7 @@ Ensure you review the {uri-terraform-dependencies}[dependencies].
 |bastion
 |===
 
-== Taggin Parameters
+== Tagging Parameters
 
 [stripes=odd,cols="1d,4d,3a,3a", options=header,width="100%"] 
 |===

ons.tf

@@ -3,7 +3,11 @@
 
 provider "oci" {
   alias            = "home"
+  fingerprint      = var.api_fingerprint
+  private_key_path = var.api_private_key_path
   region           = lookup(data.oci_identity_regions.home_region.regions[0], "name")
+  tenancy_ocid     = var.tenancy_id
+  user_ocid        = var.user_id
 }
 
 resource "oci_ons_notification_topic" "bastion_notification" {
@@ -25,7 +29,7 @@ resource "oci_ons_subscription" "bastion_notification" {
 resource "oci_identity_dynamic_group" "bastion_notification" {
   provider = oci.home
 
-  compartment_id = var.root_compartment_id
+  compartment_id = var.tenancy_id
   depends_on     = [oci_core_instance.bastion]
   description    = "dynamic group to allow bastion to send notifications to ONS"
   matching_rule  = "ALL {instance.id = '${join(",", data.oci_core_instance.bastion.*.id)}'}"

variables.tf

@@ -45,12 +45,6 @@ variable "label_prefix" {
   default     = "none"
 }
 
-variable "root_compartment_id" {
-  # specify a different name so it can be used in resource manager
-  description = "tenancy id where to create the sources"
-  type        = string
-}
-
 # network parameters
 
 variable "availability_domain" {