Removed compartment_id from volume attachments

Author: smithzc

terraform/modules/bastion/main.tf

@@ -38,7 +38,6 @@ resource "oci_core_volume" "BastionLogVolume" {
 resource "oci_core_volume_attachment" "BastionLogAttachment" {
   count           = "1"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.Bastion.id}"
   volume_id       = "${oci_core_volume.BastionLogVolume.id}"
   device          = "/dev/oracleoci/oraclevdb"
@@ -56,7 +55,6 @@ resource "oci_core_volume" "BastionClouderaVolume" {
 resource "oci_core_volume_attachment" "BastionClouderaAttachment" {
   count           = "1"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.Bastion.id}"
   volume_id       = "${oci_core_volume.BastionClouderaVolume.id}"
   device          = "/dev/oracleoci/oraclevdc"

terraform/modules/master/main.tf

@@ -41,7 +41,6 @@ resource "oci_core_volume" "MasterLogVolume" {
 resource "oci_core_volume_attachment" "MasterLogAttachment" {
   count           = "${var.instances}"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.Master.*.id[count.index]}"
   volume_id       = "${oci_core_volume.MasterLogVolume.*.id[count.index]}"
   device          = "/dev/oracleoci/oraclevdb"
@@ -59,7 +58,6 @@ resource "oci_core_volume" "MasterClouderaVolume" {
 resource "oci_core_volume_attachment" "MasterClouderaAttachment" {
   count           = "${var.instances}"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.Master.*.id[count.index]}"
   volume_id       = "${oci_core_volume.MasterClouderaVolume.*.id[count.index]}"
   device          = "/dev/oracleoci/oraclevdc"
@@ -77,7 +75,6 @@ resource "oci_core_volume" "MasterNNVolume" {
 resource "oci_core_volume_attachment" "MasterNNAttachment" {
   count           = "${var.instances}"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.Master.*.id[count.index]}"
   volume_id       = "${oci_core_volume.MasterNNVolume.*.id[count.index]}"
   device          = "/dev/oracleoci/oraclevdd"

terraform/modules/utility/main.tf

@@ -47,7 +47,6 @@ resource "oci_core_volume" "UtilLogVolume" {
 resource "oci_core_volume_attachment" "UtilLogAttachment" {
   count           = "1"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.Utility.id}"
   volume_id       = "${oci_core_volume.UtilLogVolume.id}"
   device          = "/dev/oracleoci/oraclevdb"
@@ -65,7 +64,6 @@ resource "oci_core_volume" "UtilClouderaVolume" {
 resource "oci_core_volume_attachment" "UtilClouderaAttachment" {
   count           = "1"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.Utility.id}"
   volume_id       = "${oci_core_volume.UtilClouderaVolume.id}"
   device          = "/dev/oracleoci/oraclevdc"

terraform/modules/worker/main.tf

@@ -41,7 +41,6 @@ resource "oci_core_volume" "WorkerLogVolume" {
 resource "oci_core_volume_attachment" "WorkerLogAttachment" {
   count           = "${var.instances}"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.Worker.*.id[count.index]}"
   volume_id       = "${oci_core_volume.WorkerLogVolume.*.id[count.index]}"
   device          = "/dev/oracleoci/oraclevdb"
@@ -59,7 +58,6 @@ resource "oci_core_volume" "WorkerClouderaVolume" {
 resource "oci_core_volume_attachment" "WorkerClouderaAttachment" {
   count           = "${var.instances}"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.Worker.*.id[count.index]}"
   volume_id       = "${oci_core_volume.WorkerClouderaVolume.*.id[count.index]}"
   device          = "/dev/oracleoci/oraclevdc"
@@ -77,7 +75,6 @@ resource "oci_core_volume" "WorkerDataVolume" {
 resource "oci_core_volume_attachment" "WorkerDataAttachment" {
   count               = "${(var.instances * var.block_volumes_per_worker)}"
   attachment_type = "iscsi"
-  compartment_id  = "${var.compartment_ocid}"
   instance_id     = "${oci_core_instance.Worker.*.id[count.index/var.block_volumes_per_worker]}"
   volume_id       = "${oci_core_volume.WorkerDataVolume.*.id[count.index]}"
   device = "${var.data_volume_attachment_device[count.index%(var.block_volumes_per_worker)]}"