Commit 9cbfe32a authored by Ryan Randles Jones's avatar Ryan Randles Jones
Browse files

changed module names to get rid of ambiguity

parent 4720b131
......@@ -28,22 +28,22 @@ output "internal_network_id" {
}
# runs the floating-ip module - uses public network name defined above
module "floating-ip" {
module "floating-ip-address" {
source = "./floating-ip"
public_network_name = var.public_network_name
}
# calls the outputs defined in the floating-ip module
output "floating_ip_ohpc" {
value = "${module.floating-ip.ohpc_address}"
value = "${module.floating-ip-address.ohpc_address}"
}
output "floating_ip_ood" {
value = "${module.floating-ip.ood_address}"
value = "${module.floating-ip-address.ood_address}"
}
# runs the key-pair module - imports local public key into openstack and give it the name defined above in the variables
module "keypair" {
module "import-keypair" {
source = "./key-pair"
keypair_name = var.keypair_name
ssh_public_key = var.ssh_public_key
......@@ -51,61 +51,61 @@ module "keypair" {
# calls the outputs defined in the key-pair module
output "keypair_name" {
value = "${module.keypair.keypair_name}"
value = "${module.import-keypair.keypair_name}"
}
# runs the ohpc-instance module - creates ohpc instance using variables defined above
# calls functions from dmz-network, keypair, and floating-ip modules to get values created there for use
module "ohpc-instance" {
# calls functions from dmz-network, import-keypair, and floating-ip-address modules to get values created there for use
module "create-ohpc-instance" {
external_subnet_id = "${module.dmz-network.external_subnet_id}"
source = "./ohpc-instance"
ohpc_instance_name = var.ohpc_instance_name
image_ohpc = var.image_ohpc
flavor = var.flavor
key_pair = "${module.keypair.keypair_name}"
key_pair = "${module.import-keypair.keypair_name}"
external_net = var.external_net
internal_net = var.internal_net
floating_ip_ohpc = "${module.floating-ip.ohpc_address}"
floating_ip_ohpc = "${module.floating-ip-address.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, keypair, and floating-ip modules to get values created there for use
module "ood-instance" {
# calls functions from cluster-network, import-keypair, and floating-ip-address modules to get values created there for use
module "create-ood-instance" {
internal_subnet_id = "${module.cluster-network.internal_subnet_id}"
source = "./ood-instance"
ood_instance_name = var.ood_instance_name
image_ood = var.image_ood
flavor = var.flavor
key_pair = "${module.keypair.keypair_name}"
key_pair = "${module.import-keypair.keypair_name}"
internal_net = var.internal_net
external_net = var.external_net
floating_ip_ood = "${module.floating-ip.ood_address}"
floating_ip_ood = "${module.floating-ip-address.ood_address}"
host_prefix = var.host_prefix
ood_user = var.ood_user
ssh_private_key = var.ssh_private_key
}
# runs the nodes module - creates nodes using variables defined above
# calls functions from cluster-network and keypair modules to get values created there for use
# calls functions from cluster-network and import-keypair modules to get values created there for use
module "nodes" {
internal_subnet_id = "${module.cluster-network.internal_subnet_id}"
source = "./nodes"
image_compute = var.image_compute
flavor = var.flavor
key_pair = "${module.keypair.keypair_name}"
key_pair = "${module.import-keypair.keypair_name}"
compute_node_count = var.compute_node_count
internal_net = var.internal_net
}
# calls the outputs defined in the ohpc-instance module
output "ohpc-ssh_host" {
value = "${module.ohpc-instance.ssh_host}"
value = "${module.create-ohpc-instance.ssh_host}"
}
# calls the outputs defined in the ood-instance module
output "ood-ssh_host" {
value = "${module.ood-instance.ssh_host}"
value = "${module.create-ood-instance.ssh_host}"
}
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment