diff --git a/main.tf b/main.tf index 8b516bbe7d747dd58089f0df95344c199c6c5cb0..c6fe4952b8e7f03fb0b0261009bb927d524420b9 100644 --- a/main.tf +++ b/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" { diff --git a/ohpc-instance/main.tf b/ohpc-instance/main.tf index db7651f3ba52ebaa29b20812771662120d5c64d2..e690d8eedb91a5c9613f871b10d21618bd1cb722 100644 --- a/ohpc-instance/main.tf +++ b/ohpc-instance/main.tf @@ -48,6 +48,7 @@ resource "openstack_compute_instance_v2" "ohpc" { - | #!/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