Improvements to examples.

craigcarl-oracle · craigcarl-oracle · commit b7c61fef5921 · 2017-02-21T07:33:14.000-08:00
diff --git a/docs/examples/DBsystems/DBsystems.tf b/docs/examples/DBsystems/DBsystems.tf
@@ -10,7 +10,6 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
-  private_key = "${var.private_key}"
 }
 
 resource "baremetal_database_db_system" "dev_db_1" {
diff --git a/docs/examples/Gluster/gluster.tf b/docs/examples/Gluster/gluster.tf
@@ -8,7 +8,7 @@ provider "baremetal" {
   tenancy_ocid = "${var.tenancy_ocid}"
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
-  private_key = "${var.private_key}"
+  private_key = "${var.private_key_path}"
 }
 
 variable "VPC-CIDR" {
diff --git a/docs/examples/IAM/compartment/compartment.tf b/docs/examples/IAM/compartment/compartment.tf
@@ -9,7 +9,6 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
-  private_key = "${var.private_key}"
 }
 
 resource "baremetal_identity_compartment" "a_TF_managed_compartment" {
diff --git a/docs/examples/IAM/group/group.tf b/docs/examples/IAM/group/group.tf
@@ -9,7 +9,6 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
-  private_key = "${var.private_key}"
 }
 
 resource "baremetal_identity_group" "my_first_TF_group" {
diff --git a/docs/examples/IAM/policy/policy.tf b/docs/examples/IAM/policy/policy.tf
@@ -9,7 +9,6 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
-  private_key = "${var.private_key}"
 }
 
   resource "baremetal_identity_policy" "IAM_policy" {
diff --git a/docs/examples/IAM/user/user.tf b/docs/examples/IAM/user/user.tf
@@ -9,7 +9,6 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
-  private_key = "${var.private_key}"
 }
 
 resource "baremetal_identity_user" "tf_user" {
diff --git a/docs/examples/Secure_MongoDB/secure_mongodb.tf b/docs/examples/Secure_MongoDB/secure_mongodb.tf
@@ -11,7 +11,7 @@ provider "baremetal" {
   tenancy_ocid = "${var.tenancy_ocid}"
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
-  private_key = "${var.private_key}"
+  private_key = "${var.private_key_path}"
 }
 
 variable "VPC-CIDR" {
diff --git a/docs/examples/compute/BMinstance/instance.tf b/docs/examples/compute/BMinstance/instance.tf
@@ -10,7 +10,6 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
-  private_key = "${var.private_key}"
 }
 
 # Note that the difference between launching a VM and BM instance is just a different shape name.
diff --git a/docs/examples/compute/VMinstance/instance.tf b/docs/examples/compute/VMinstance/instance.tf
@@ -10,7 +10,6 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
-  private_key = "${var.private_key}"
 }
 
 # Note that the difference between launching a VM and BM instance is just a different shape name.
diff --git a/docs/examples/network/complete_vcn/complete_vcn.tf b/docs/examples/network/complete_vcn/complete_vcn.tf
@@ -8,7 +8,7 @@ provider "baremetal" {
   tenancy_ocid = "${var.tenancy_ocid}"
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
-  private_key = "${var.private_key}"
+  private_key = "${var.private_key_path}"
 }
 
 variable "VPC-CIDR" {
diff --git a/docs/examples/network/route_table/route_table.tf b/docs/examples/network/route_table/route_table.tf
@@ -11,6 +11,7 @@ provider "baremetal" {
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
   private_key = "${var.private_key}"
+  private_key = "${var.private_key_path}"
 }
 
 resource "baremetal_core_route_table" "a_route_table" {
diff --git a/docs/examples/network/security_list/security_list.tf b/docs/examples/network/security_list/security_list.tf
@@ -10,7 +10,7 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
-  private_key = "${var.private_key}"
+  private_key = "${var.private_key_path}"
 }
 
 # Protocols are specified as protocol numbers.
diff --git a/docs/examples/network/simple_vcn/vcn.tf b/docs/examples/network/simple_vcn/vcn.tf
@@ -8,7 +8,7 @@ provider "baremetal" {
   tenancy_ocid = "${var.tenancy_ocid}"
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
-  private_key = "${var.private_key}"
+  private_key = "${var.private_key_path}"
 }
 
 resource "baremetal_core_virtual_network" "a_TF_managed_VCN" {
diff --git a/docs/examples/network/single_subnet/subnet.tf b/docs/examples/network/single_subnet/subnet.tf
@@ -9,7 +9,6 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
-  private_key = "${var.private_key}"
 }
 
 /* 
diff --git a/docs/examples/storage/block/block.tf b/docs/examples/storage/block/block.tf
@@ -17,7 +17,6 @@ provider "baremetal" {
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
   private_key_path = "${var.private_key_path}"
-  private_key = "${var.private_key}"
 }
 
 resource "baremetal_core_volume" "block-1" {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ provider "baremetal" {`
`10`	`10`	`user_ocid = "${var.user_ocid}"`
`11`	`11`	`fingerprint = "${var.fingerprint}"`
`12`	`12`	`private_key_path = "${var.private_key_path}"`
`13`		`- private_key = "${var.private_key}"`
`14`	`13`	`}`
`15`	`14`
`16`	`15`	`resource "baremetal_database_db_system" "dev_db_1" {`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ provider "baremetal" {`
`8`	`8`	`tenancy_ocid = "${var.tenancy_ocid}"`
`9`	`9`	`user_ocid = "${var.user_ocid}"`
`10`	`10`	`fingerprint = "${var.fingerprint}"`
`11`		`- private_key = "${var.private_key}"`
	`11`	`+ private_key = "${var.private_key_path}"`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`variable "VPC-CIDR" {`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@ provider "baremetal" {`
`9`	`9`	`user_ocid = "${var.user_ocid}"`
`10`	`10`	`fingerprint = "${var.fingerprint}"`
`11`	`11`	`private_key_path = "${var.private_key_path}"`
`12`		`- private_key = "${var.private_key}"`
`13`	`12`	`}`
`14`	`13`
`15`	`14`	`resource "baremetal_identity_compartment" "a_TF_managed_compartment" {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ provider "baremetal" {`
`11`	`11`	`tenancy_ocid = "${var.tenancy_ocid}"`
`12`	`12`	`user_ocid = "${var.user_ocid}"`
`13`	`13`	`fingerprint = "${var.fingerprint}"`
`14`		`- private_key = "${var.private_key}"`
	`14`	`+ private_key = "${var.private_key_path}"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`variable "VPC-CIDR" {`