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

@@ -20,7 +20,6 @@ variable "user_data_script" {
   default     = <<-EOF
     #!/bin/bash
     sudo mkdir -p /data/xdmod/queues
-    sudo mount ${module.create-ohpc-instance.device[0]}1 /var/lib/mysql
     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
@@ -87,7 +86,6 @@ module "create-ohpc-instance" {
     ohpc_user =  var.ohpc_user
     ssh_private_key = var.ssh_private_key
     vol_id = data.openstack_blockstorage_volume_v3.disk.id
-    user_data_script    = var.user_data_script
 }
 
 # runs the ood-instance module - creates ood instance using variables defined above

ohpc-instance/main.tf

@@ -37,13 +37,23 @@ resource "openstack_compute_instance_v2" "ohpc" {
   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
+    write_files:
+    - content: |
+        10.1.1.10 ohpc ohpc.novalocal
+        owner: centos:centos
+        path: /etc/hosts
+        permissions: '0644'
+
+      runcmd:
+      - |
+          #!/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
 
 # defines the networks of the instance
   network {