Merge pull request #6 from oracle-terraform-modules/alexng/master

v0.12 preparation: Fix metadata usage to be canonical and convert list indices to whole integer values

Author: alexng-modules

main.tf

@@ -30,7 +30,7 @@ resource "oci_core_instance" "this" {
     subnet_id              = "${data.oci_core_subnet.this.*.id[count.index % length(data.oci_core_subnet.this.*.id)]}"
   }
 
-  metadata {
+  metadata = {
     ssh_authorized_keys = "${file("${var.ssh_authorized_keys}")}"
     user_data           = "${var.user_data}"
   }
@@ -61,8 +61,8 @@ resource "oci_core_volume" "this" {
   count               = "${var.instance_count * length(var.block_storage_sizes_in_gbs)}"
   availability_domain = "${oci_core_instance.this.*.availability_domain[count.index % var.instance_count]}"
   compartment_id      = "${var.compartment_ocid}"
-  display_name        = "${oci_core_instance.this.*.display_name[count.index % var.instance_count]}_volume${count.index / var.instance_count}"
-  size_in_gbs         = "${element(var.block_storage_sizes_in_gbs, count.index / var.instance_count)}"
+  display_name        = "${oci_core_instance.this.*.display_name[count.index % var.instance_count]}_volume${floor(count.index / var.instance_count)}"
+  size_in_gbs         = "${element(var.block_storage_sizes_in_gbs, floor(count.index / var.instance_count))}"
 }
 
 ####################