Skip to content
Snippets Groups Projects
Commit 24ff7139 authored by EesaanAtluri's avatar EesaanAtluri
Browse files

Comment all OOD-related code to save no. of cores.

We use extra large images for deploying and we have a limit of 20 cores
per project. So in order to save the no. of cores used we comment ood-
related code because it is not required for testing.
parent a989cafb
No related branches found
No related tags found
2 merge requests!6Add CD feature to the repo,!2fix network naming convention in terraform code.
...@@ -38,9 +38,9 @@ output "floating_ip_ohpc" { ...@@ -38,9 +38,9 @@ output "floating_ip_ohpc" {
value = "${module.floating-ip-address.ohpc_address}" value = "${module.floating-ip-address.ohpc_address}"
} }
output "floating_ip_ood" { #output "floating_ip_ood" {
value = "${module.floating-ip-address.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 # runs the key-pair module - imports local public key into openstack and give it the name defined above in the variables
module "import-keypair" { module "import-keypair" {
...@@ -74,21 +74,20 @@ module "create-ohpc-instance" { ...@@ -74,21 +74,20 @@ module "create-ohpc-instance" {
# runs the ood-instance module - creates ood instance using variables defined above # runs the ood-instance module - creates ood instance using variables defined above
# calls functions from cluster-network, import-keypair, and floating-ip-address modules to get values created there for use # calls functions from cluster-network, import-keypair, and floating-ip-address modules to get values created there for use
module "create-ood-instance" { #module "create-ood-instance" {
internal_subnet_id = "${module.cluster-network.internal_subnet_id}" # internal_subnet_id = "${module.cluster-network.internal_subnet_id}"
source = "./ood-instance" # source = "./ood-instance"
ood_instance_name = var.ood_instance_name # ood_instance_name = var.ood_instance_name
image_ood = var.image_ood # image_ood = var.image_ood
flavor = var.flavor # flavor = var.flavor
key_pair = "${module.import-keypair.keypair_name}" # key_pair = "${module.import-keypair.keypair_name}"
internal_network = var.internal_network # internal_network = var.internal_network
internal_ip = var.ood_private_ip # external_network = var.external_network
external_network = var.external_network # floating_ip_ood = "${module.floating-ip-address.ood_address}"
floating_ip_ood = "${module.floating-ip-address.ood_address}" # host_prefix = var.host_prefix
host_prefix = var.host_prefix # ood_user = var.ood_user
ood_user = var.ood_user # ssh_private_key = var.ssh_private_key
ssh_private_key = var.ssh_private_key #}
}
# runs the nodes module - creates nodes using variables defined above # 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 # calls functions from cluster-network and import-keypair modules to get values created there for use
...@@ -108,9 +107,9 @@ output "ohpc-ssh_host" { ...@@ -108,9 +107,9 @@ output "ohpc-ssh_host" {
} }
# calls the outputs defined in the ood-instance module # calls the outputs defined in the ood-instance module
output "ood-ssh_host" { #output "ood-ssh_host" {
value = "${module.create-ood-instance.ssh_host}" # value = "${module.create-ood-instance.ssh_host}"
} #}
# compute node and ood post provision # compute node and ood post provision
# use single null_resource for serial provisioner runs to avoid race conditions # use single null_resource for serial provisioner runs to avoid race conditions
...@@ -141,9 +140,9 @@ resource "null_resource" "ops" { ...@@ -141,9 +140,9 @@ resource "null_resource" "ops" {
} }
# ood node # ood node
provisioner "remote-exec" { # provisioner "remote-exec" {
inline = [ # inline = [
for net in module.create-ood-instance.network: # for net in module.create-ood-instance.network:
"ansible-playbook -c local -i /CRI_XCBC/hosts -l `hostname -s` -e \"{'compute_nodes':[{'name':'${var.ood_instance_name}', 'ip':'${net.fixed_ip_v4}', 'mac':'${net.mac}', 'vnfs':'', 'sockets':'1', 'corespersocket':'1'}]}\" /CRI_XCBC/site-ops.yaml -b -v"] # "ansible-playbook -c local -i /CRI_XCBC/hosts -l `hostname -s` -e \"{'compute_nodes':[{'name':'${var.ood_instance_name}', 'ip':'${net.fixed_ip_v4}', 'mac':'${net.mac}', 'vnfs':'', 'sockets':'1', 'corespersocket':'1'}]}\" /CRI_XCBC/site-ops.yaml -b -v"]
} # }
} }
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