Skip to content
Snippets Groups Projects
Commit 639055e4 authored by Eesaan Atluri's avatar Eesaan Atluri
Browse files

remove the internal network as compute nodes are not deployed

parent c7f0f088
No related branches found
No related tags found
1 merge request!27Feat trim tf deploy
Pipeline #8742 passed with stages
in 2 minutes and 17 seconds
...@@ -14,19 +14,6 @@ provider "openstack" { ...@@ -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 # runs the floating-ip module - uses public network name defined above
module "floating-ip-address" { module "floating-ip-address" {
source = "./floating-ip" source = "./floating-ip"
...@@ -62,8 +49,6 @@ module "create-ohpc-instance" { ...@@ -62,8 +49,6 @@ module "create-ohpc-instance" {
flavor = var.flavor flavor = var.flavor
key_pair = module.import-keypair.keypair_name key_pair = module.import-keypair.keypair_name
external_network = data.openstack_networking_network_v2.external_net.id 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 floating_ip_ohpc = module.floating-ip-address.ohpc_address
ohpc_user = var.ohpc_user ohpc_user = var.ohpc_user
ssh_private_key = var.ssh_private_key ssh_private_key = var.ssh_private_key
......
...@@ -17,8 +17,6 @@ variable "flavor" {} ...@@ -17,8 +17,6 @@ variable "flavor" {}
# is created in key-pair module and called in root module # is created in key-pair module and called in root module
variable "key_pair" {type = string} variable "key_pair" {type = string}
variable "internal_network" {}
variable "internal_ip" {}
variable "external_network" {} variable "external_network" {}
# is created in floating-ip module and called in root module # is created in floating-ip module and called in root module
...@@ -49,10 +47,6 @@ resource "openstack_compute_instance_v2" "ohpc" { ...@@ -49,10 +47,6 @@ resource "openstack_compute_instance_v2" "ohpc" {
network { network {
uuid = var.external_network uuid = var.external_network
} }
network {
uuid = var.internal_network
fixed_ip_v4 = var.internal_ip
}
} }
# associates floating ip with the OHPC instance # associates floating ip with the OHPC instance
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment