Merge remote-tracking branch 'origin/feat-remove-remote-exec-for-mount' into...

Merge remote-tracking branch 'origin/feat-remove-remote-exec-for-mount' into feat-integration-testing

main.tf

@@ -14,19 +14,6 @@ provider "openstack" {
     }
 }
 
-variable "user_data_script" {
-  description = "User data script to be executed during instance initialization"
-  type        = string
-  default     = <<-EOF
-    #!/bin/bash
-    sudo mkdir -p /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
-    sudo sed -i -E 's/xdmod..nip.io/xdmod.rc.uab.edu/g' /etc/xdmod/simplesamlphp/config/config.php
-    sudo systemctl restart httpd
-  EOF
-}
 
 # runs the internal-network module
 module "cluster-network" {

ohpc-instance/main.tf

@@ -48,6 +48,8 @@ resource "openstack_compute_instance_v2" "ohpc" {
       - |
           #!/bin/bash
           sudo mkdir -p /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