diff --git a/ohpc-instance/main.tf b/ohpc-instance/main.tf index 01f0c93cd43b9361f97449584885b132d678524e..e8dc57b4b0377ebce00c8b626074d4940d250095 100644 --- a/ohpc-instance/main.tf +++ b/ohpc-instance/main.tf @@ -50,8 +50,8 @@ resource "openstack_compute_instance_v2" "ohpc" { - | #!/bin/bash sudo mkdir -p /data/xdmod/queues - sudo mount /dev/vdc1 /var/lib/mysql - sudo mount /dev/vdb1 /data/xdmod/queues + sudo mount /dev/vdb1 /var/lib/mysql + sudo mount /dev/vdc1 /data/xdmod/queues sudo df -h sudo systemctl restart mariadb sudo sed -i -E 's/xdmod..nip.io/xdmod.rc.uab.edu/g' /etc/httpd/conf.d/xdmod.conf @@ -75,13 +75,18 @@ resource "openstack_compute_floatingip_associate_v2" "ohpc" { instance_id = openstack_compute_instance_v2.ohpc.id } -# Attach volumes -resource "openstack_compute_volume_attach_v2" "volume_attach" { - count = length(var.vol_ids) +# Attach specific volumes +resource "openstack_compute_volume_attach_v2" "attach_prod_volume" { instance_id = openstack_compute_instance_v2.ohpc.id - volume_id = var.vol_ids[count.index] + volume_id = var.data_volume } +resource "openstack_compute_volume_attach_v2" "attach_prod_queue_volume" { + instance_id = openstack_compute_instance_v2.ohpc.id + volume_id = var.prod_volume_id +} + + output "xdmod_instance_id" { value = openstack_compute_instance_v2.ohpc.id } @@ -92,8 +97,8 @@ output "ssh_host" { output "device" { value = [ - openstack_compute_volume_attach_v2.volume_attach[0].device, - openstack_compute_volume_attach_v2.volume_attach[1].device, + openstack_compute_volume_attach_v2.attach_prod_volume.device, + openstack_compute_volume_attach_v2.attach_prod_queue_volume.device ] }