diff --git a/main.tf b/main.tf index 1f24a1ee65a206045d62e3df8439fce5c06af5d7..57f495a6ca9e8496cd7d1f6dd334d61db9df76b0 100644 --- a/main.tf +++ b/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 diff --git a/ohpc-instance/main.tf b/ohpc-instance/main.tf index a969f921b40d67010a05e5447660b6dc6e535ab6..db7651f3ba52ebaa29b20812771662120d5c64d2 100644 --- a/ohpc-instance/main.tf +++ b/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 {