diff --git a/main.tf b/main.tf index f1a40e3f148aee07ea4eabd61913db3ccf3b7795..4f7148279d22f2a84de66838235906f412e3b69d 100644 --- a/main.tf +++ b/main.tf @@ -52,8 +52,8 @@ module "create-ohpc-instance" { image_ohpc = var.image_ohpc flavor = var.flavor key_pair = module.import-keypair.keypair_name - external_network = data.external_net.id - internal_network = data.internal_net.id + external_network = data.openstack_networking_network_v2.external_net.id + internal_network = data.openstack_networking_network_v2.internal_net.id internal_ip = var.ohpc_private_ip floating_ip_ohpc = module.floating-ip-address.ohpc_address ohpc_user = var.ohpc_user @@ -80,13 +80,12 @@ module "create-ohpc-instance" { # runs the nodes module - creates nodes using variables defined above # 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.import-keypair.keypair_name compute_node_count = var.compute_node_count - internal_network = module.cluster-network.id + internal_network = data.openstack_networking_network_v2.internal_net.id } # calls the outputs defined in the ohpc-instance module