diff --git a/main.tf b/main.tf index 1c3b9939547da7ef14e926700a84dc9bd37ca806..99da7dce2f3236cc77a46eced328595a4d7a1cb8 100644 --- a/main.tf +++ b/main.tf @@ -14,19 +14,6 @@ provider "openstack" { } } -# runs the internal-network module -module "cluster-network" { - internal_net = var.internal_network - source = "./internal-network" - # Default name var is in the module main file - admin_state_up = var.admin_state_up - enable_dhcp = var.enable_dhcp -} -# calls the outputs defined in the internal-network module -output "internal_network_id" { - value = "${module.cluster-network.internal_network_id}" -} - # runs the floating-ip module - uses public network name defined above module "floating-ip-address" { source = "./floating-ip" @@ -62,8 +49,6 @@ module "create-ohpc-instance" { flavor = var.flavor key_pair = module.import-keypair.keypair_name external_network = data.openstack_networking_network_v2.external_net.id - internal_network = "${module.cluster-network.internal_network_id}" - internal_ip = var.ohpc_private_ip floating_ip_ohpc = module.floating-ip-address.ohpc_address ohpc_user = var.ohpc_user ssh_private_key = var.ssh_private_key diff --git a/ohpc-instance/main.tf b/ohpc-instance/main.tf index f9686296cefca24b84a3e31793768d8f62ed2f5a..433e10efebf3de9cb373dc0e18bc94027cea96a1 100644 --- a/ohpc-instance/main.tf +++ b/ohpc-instance/main.tf @@ -17,8 +17,6 @@ variable "flavor" {} # is created in key-pair module and called in root module variable "key_pair" {type = string} -variable "internal_network" {} -variable "internal_ip" {} variable "external_network" {} # is created in floating-ip module and called in root module @@ -49,10 +47,6 @@ resource "openstack_compute_instance_v2" "ohpc" { network { uuid = var.external_network } - network { - uuid = var.internal_network - fixed_ip_v4 = var.internal_ip - } } # associates floating ip with the OHPC instance