Merge pull request #7 from chokhareganesh/master

after uncommenting distributed mudule in main.tf and terraform fmt

Author: bhushan-rane

main.tf

@@ -3,38 +3,47 @@ provider "libvirt" {
   uri = "qemu:///system"
 }
 
-
 #you can only uncomment either "distributed_topology or basic_topology module" for deployment and gives specefied variable values
 
+
 #importing all modues from module directory
 
-#uncomment for distributed techonology
-#module "distributed_topology" {
 
-  #For Distributed all node images path required.
 
-  #source          = "modules/distributed_topology/"
-  #proxy_img_path  = "paste_proxy_image_path"
-  #mng_img_path    = "paste_management_image_path"
-  #boot_img_path   = "paste_boot_image_path"
-  #worker_img_path = "paste_worker_image_path"
-  #master_img_path = "paste_master_image_path"
+module "distributed_topology" {
+
+
+#For Distributed all node images path required.
+
+
+source          = "modules/distributed_topology/"
+proxy_img_path  = "paste_proxy_image_path"
+mng_img_path    = "paste_management_image_path"
+boot_img_path   = "paste_boot_image_path"
+worker_img_path = "paste_worker_image_path"
+master_img_path = "paste_master_image_path"
+
+
+ssh_private_key_path = "paste_path_of_id_rsa"
+default_worker       = "1"
+extra_worker         = "0"
+}
 
-  #ssh_private_key_path = "paste_path_of_id_rsa"
-  #default_worker       = "1"
-  #extra_worker         = "0"
-#}
 
 #uncomment for basic topology
 #module "basic_topology" {
 
-  #For Basic only master_img_path and worker_img_path is required. 
- 
-  #source = "modules/basic_topology/"  
-  #worker_img_path ="paste_worker_image_path"   
-  #master_img_path ="paste_master_image_path"
 
-  #ssh_private_key_path = "paste_path_of_id_rsa"
-  #default_worker       = "1"
-  #extra_worker         = "0"
+#For Basic only master_img_path and worker_img_path is required. 
+
+
+#source = "modules/basic_topology/"  
+#worker_img_path ="paste_worker_image_path"   
+#master_img_path ="paste_master_image_path"
+
+
+#ssh_private_key_path = "paste_path_of_id_rsa"
+#default_worker       = "1"
+#extra_worker         = "0"
 #}
+

modules/basic_topology/worker.tf

@@ -15,16 +15,12 @@ resource "libvirt_cloudinit" "worker" {
   count          = "${var.default_worker}"
   user_data      = "${file("node_config/worker_config")}"
   local_hostname = "worker${count.index}"
-
- 
 }
 
 resource "libvirt_volume" "volume" {
   name           = "volume-${count.index}"
   base_volume_id = "${libvirt_volume.ICP.id}"
   count          = "${var.default_worker}"
-
-  
 }
 
 # Create the resource VM for worker

modules/distributed_topology/boot.tf

@@ -111,5 +111,4 @@ resource "libvirt_domain" "ICP_boot" {
   depends_on = [
     "libvirt_domain.ICP_proxy",
   ]
-
 }

modules/distributed_topology/extra_worker.tf

@@ -4,16 +4,12 @@ resource "libvirt_cloudinit" "exworker" {
   count          = "${var.extra_worker}"
   user_data      = "${file("node_config/extraworker_config")}"
   local_hostname = "exworker${count.index}"
-
-   
 }
 
 resource "libvirt_volume" "exvolume" {
   name           = "exvolume-${count.index}"
   base_volume_id = "${libvirt_volume.ICP.id}"
   count          = "${var.extra_worker}"
-
-  
 }
 
 # Create the resource for extra worker machine
@@ -23,7 +19,6 @@ resource "libvirt_domain" "ExICPworker" {
   vcpu   = 2
   count  = "${var.extra_worker}"
 
-  
   cloudinit = "${element(libvirt_cloudinit.exworker.*.id,count.index)}"
 
   depends_on = [
@@ -110,4 +105,3 @@ resource "null_resource" "ExICPworker" {
     private_key = "${file("${var.ssh_private_key_path}")}"
   }
 }
-

modules/distributed_topology/management.tf

@@ -79,6 +79,4 @@ resource "libvirt_domain" "ICP_mng" {
     port        = "22"
     private_key = "${file("${var.ssh_private_key_path}")}"
   }
-
 }
-

modules/distributed_topology/worker.tf

@@ -13,7 +13,7 @@ resource "libvirt_cloudinit" "worker" {
   pool           = "default"                              #CHANGE_ME if you use anohter storage pool
   count          = "${var.default_worker}"
   user_data      = "${file("node_config/worker_config")}"
-  local_hostname = "worker${count.index}"  
+  local_hostname = "worker${count.index}"
 }
 
 resource "libvirt_volume" "volume" {
@@ -89,5 +89,4 @@ resource "libvirt_domain" "ICP_worker" {
   depends_on = [
     "libvirt_domain.ICP_mng",
   ]
-
 }