From 639055e4d95abd9dc6328308472e388047179ddb Mon Sep 17 00:00:00 2001
From: Eesaan Atluri <atlurie@uab.edu>
Date: Wed, 13 Sep 2023 15:08:28 -0500
Subject: [PATCH] remove the internal network as compute nodes are not deployed
---
main.tf | 15 ---------------
ohpc-instance/main.tf | 6 ------
2 files changed, 21 deletions(-)
diff --git a/main.tf b/main.tf
index 1c3b993..99da7dc 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 f968629..433e10e 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
--
GitLab