diff --git a/external-network/main.tf b/external-network/main.tf index b2a15f24ad63043e833682d38f923c8fc6ebebd6..403064c8d8b40ca0fffb1f33a0a6b005ee8f45cc 100644 --- a/external-network/main.tf +++ b/external-network/main.tf @@ -20,7 +20,7 @@ resource "openstack_networking_subnet_v2" "external_subnet" { network_id = openstack_networking_network_v2.external_network.id cidr = "192.168.100.0/24" ip_version = 4 - dns_nameservers = ["8.8.8.8"] + dns_nameservers = ["172.20.0.137", "172.20.0.3", "8.8.8.8"] enable_dhcp = var.enable_dhcp } @@ -46,4 +46,4 @@ output "external_subnet_id" { output "router_id" { value = openstack_networking_router_v2.router.id -} \ No newline at end of file +} diff --git a/main.tf b/main.tf index 2031ad4572f62c66b0b5cacc4795d43639e8de6f..c75a6bb0fbf21b7d0c8d1dfb776b502e10fc4dc7 100644 --- a/main.tf +++ b/main.tf @@ -129,7 +129,26 @@ resource "null_resource" "compute_ops" { provisioner "remote-exec" { inline = [ for node, net in module.nodes.network: - "ansible-playbook -i /CRI_XCBC/hosts -l `hostname -s` -e \"{'node_name':'${node}', 'node_ip_v4':'${net[0].fixed_ip_v4}', 'node_mac':'${net[0].mac}'}\" /CRI_XCBC/site-ops.yaml -b -v" - ] + "ansible-playbook -i /CRI_XCBC/hosts -l `hostname -s` -e \"{'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 post provision +resource "null_resource" "ood_ops" { + triggers = { + ohpc_instance = module.create-ohpc-instance.id + } + + connection { + host = module.create-ohpc-instance.ssh_host + user = var.ohpc_user + private_key = file(var.ssh_private_key) + } + +# ood node + provisioner "remote-exec" { + inline = [ + for net in module.create-ood-instance.network: + "ansible-playbook -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"] } } diff --git a/ohpc-instance/main.tf b/ohpc-instance/main.tf index 746a7e51b437cfbe37bb1463ff038266513fafa7..cf39081368c88a4208823ef9ea0af75dcf87ee35 100644 --- a/ohpc-instance/main.tf +++ b/ohpc-instance/main.tf @@ -28,6 +28,15 @@ resource "openstack_compute_instance_v2" "ohpc" { flavor_name = var.flavor key_pair = var.key_pair security_groups = ["default"] + user_data = <<-EOF + #cloud-config + write_files: + - content: | + 10.1.1.10 ohpc ohpc.novalocal + owner: centos:centos + path: /etc/hosts + permissions: 0644 + EOF # defines the networks of the instance network {