reordered variables to improve readability

main.tf

@@ -5,7 +5,7 @@
 variable "admin_state_up" {default = true}
 variable "enable_dhcp" {default = true}
 
-# variable for floating-ip
+# variable for floating-ip - also used in exrernal network creation
 variable "public_network_name" {default = "bright-external-flat-externalnet"}
  
 # variables for keypair module
@@ -14,16 +14,16 @@ variable "ssh_public_key" {default = "~/.ssh/id_rsa.pub"}
  
 # variables for instance modules
 variable "ohpc_instance_name" {default = "ohpc"}
+variable "ood_instance_name" { default = "ood"}
 variable "image_ohpc" {default = "CentOS-7-x86_64-GenericCloud-1905"}
+variable "image_ood" {default = "CentOS-7-x86_64-GenericCloud-1905"}
 variable "flavor" {default = "m1.medium"}
 variable "internal_net" {default = "clusternet"}
 variable "external_net" {default = "dmznet"}
 variable "host_prefix" {default = "164.111.161.%s"}
 variable "ohpc_user" {default = "centos"}
-variable "ssh_private_key" {default = "~/.ssh/id_rsa"}
-variable "image_ood" {default = "CentOS-7-x86_64-GenericCloud-1905"}
-variable "ood_instance_name" { default = "ood"}
 variable "ood_user" {default = "centos"}
+variable "ssh_private_key" {default = "~/.ssh/id_rsa"}
 
 
 # variables for node creation module
@@ -88,35 +88,35 @@ output "keypair_name" {
 }
 
 # runs the ohpc-instance module - creates ohpc instance using variables defined above
-# calls functions from dmz-network, floating-ip, and keypair modules to get values created there for use
+# calls functions from dmz-network, keypair, and floating-ip modules to get values created there for use
 module "ohpc-instance" {
     source = "./ohpc-instance"
     external_subnet_id = "${module.dmz-network.external_subnet_id}"
-    floating_ip_ohpc = "${module.floating-ip.ohpc_address}"
     ohpc_instance_name = var.ohpc_instance_name
     image_ohpc = var.image_ohpc
     flavor = var.flavor
     key_pair = "${module.keypair.keypair_name}"
     external_net = var.external_net
     internal_net = var.internal_net
-    host_prefix = var.host_prefix
-    ohpc_user =  var.ohpc_user
+    floating_ip_ohpc = "${module.floating-ip.ohpc_address}"
+     host_prefix = var.host_prefix
+     ohpc_user =  var.ohpc_user
     ssh_private_key = var.ssh_private_key
 }
 
 # runs the ood-instance module - creates ood instance using variables defined above
-# calls functions from cluster-network, floating-ip, and keypair modules to get values created there for use
+# calls functions from cluster-network, keypair, and floating-ip modules to get values created there for use
 module "ood-instance" {
     source = "./ood-instance"
     internal_subnet_id = "${module.cluster-network.internal_subnet_id}"
-    floating_ip_ood = "${module.floating-ip.ood_address}"
-    flavor = var.flavor
-    host_prefix = var.host_prefix
+    ood_instance_name = var.ood_instance_name
     image_ood = var.image_ood
+    flavor = var.flavor
+    key_pair = "${module.keypair.keypair_name}"
     internal_net = var.internal_net
     external_net = var.external_net
-    key_pair = "${module.keypair.keypair_name}"
-    ood_instance_name = var.ood_instance_name
+    floating_ip_ood = "${module.floating-ip.ood_address}"
+    host_prefix = var.host_prefix
     ood_user = var.ood_user
     ssh_private_key = var.ssh_private_key
 }
@@ -126,11 +126,11 @@ module "ood-instance" {
 module "nodes" {
     source = "./nodes"
     internal_subnet_id = "${module.cluster-network.internal_subnet_id}"
-    key_pair = "${module.keypair.keypair_name}"
-    internal_net = var.internal_net
     image_compute = var.image_compute
     flavor = var.flavor
+    key_pair = "${module.keypair.keypair_name}"
     compute_node_count = var.compute_node_count
+    internal_net = var.internal_net
 }
 
 # calls the outputs defined in the ohpc-instance module