Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
Terraform Openstack
Manage
Activity
Members
Labels
Plan
Issues
10
Issue boards
Milestones
Wiki
Code
Merge requests
6
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
rc
Terraform Openstack
Commits
790d094e
Commit
790d094e
authored
1 year ago
by
Eesaan Atluri
Browse files
Options
Downloads
Patches
Plain Diff
Remove commented code related to OOD TF deployment
parent
6c147c23
No related branches found
No related tags found
1 merge request
!27
Feat trim tf deploy
Pipeline
#8737
passed with stages
in 2 minutes and 48 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
main.tf
+0
-35
0 additions, 35 deletions
main.tf
with
0 additions
and
35 deletions
main.tf
+
0
−
35
View file @
790d094e
...
@@ -38,10 +38,6 @@ output "floating_ip_ohpc" {
...
@@ -38,10 +38,6 @@ output "floating_ip_ohpc" {
value
=
module
.
floating-ip-address
.
ohpc_address
value
=
module
.
floating-ip-address
.
ohpc_address
}
}
#output "floating_ip_ood" {
# 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"
{
source
=
"./key-pair"
source
=
"./key-pair"
...
@@ -74,23 +70,6 @@ module "create-ohpc-instance" {
...
@@ -74,23 +70,6 @@ module "create-ohpc-instance" {
vol_id
=
data
.
openstack_blockstorage_volume_v2
.
disk
.
id
vol_id
=
data
.
openstack_blockstorage_volume_v2
.
disk
.
id
}
}
# 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
#module "create-ood-instance" {
# internal_subnet_id = module.cluster-network.internal_subnet_id
# source = "./ood-instance"
# ood_instance_name = var.ood_instance_name
# image_ood = var.image_ood
# flavor = var.flavor
# key_pair = module.import-keypair.keypair_name
# internal_network = var.internal_network
# external_network = var.external_network
# floating_ip_ood = module.floating-ip-address.ood_address
# host_prefix = var.host_prefix
# ood_user = var.ood_user
# 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
module
"nodes"
{
module
"nodes"
{
...
@@ -112,12 +91,6 @@ output "xdmod_instance_id" {
...
@@ -112,12 +91,6 @@ output "xdmod_instance_id" {
value
=
module
.
create-ohpc-instance
.
xdmod_instance_id
value
=
module
.
create-ohpc-instance
.
xdmod_instance_id
}
}
# calls the outputs defined in the ood-instance module
#output "ood-ssh_host" {
# value = module.create-ood-instance.ssh_host
#}
# 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
# that lead to inconsistent deploy successes.
# that lead to inconsistent deploy successes.
resource
"null_resource"
"ops"
{
resource
"null_resource"
"ops"
{
...
@@ -162,12 +135,4 @@ provisioner "remote-exec" {
...
@@ -162,12 +135,4 @@ provisioner "remote-exec" {
"ansible-playbook -c local -i /CRI_XCBC/hosts -l `hostname -s` -e
\"
{'cod_deploy':'false', 'compute_nodes':[{'name':'
${
node
}
', 'ip':'
${
net
[
0
].
fixed_ip_v4
}
', 'mac':'
${
net
[
0
].
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
\"
{'cod_deploy':'false', 'compute_nodes':[{'name':'
${
node
}
', 'ip':'
${
net
[
0
].
fixed_ip_v4
}
', 'mac':'
${
net
[
0
].
mac
}
', 'vnfs':'', 'sockets':'1', 'corespersocket':'1'}]}
\"
/CRI_XCBC/site-ops.yaml -b -v"
]
]
}
}
# ood node
# provisioner "remote-exec" {
# inline = [
# 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"]
# }
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment