diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index aa258db03c17d752feec4d421efab4837a96ab70..55ba7b6673016090e1f435e756dbe175dfacd61b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,9 +49,9 @@ tf-apply: - export TF_VAR_external_network="tf-dmznet-$BUILD_DATE" - export TF_VAR_keypair_name="os-gen-keypair-$BUILD_DATE" - XDMOD_IMAGES=($(openstack image list --sort-column Name --sort-descending -f value -c Name -c ID | grep -P ' xdmod-\d{14}$' | awk '{print $2}')) - - export TF_VAR_image_ohpc="${XDMOD_IMAGES[1]}" - - export TF_VAR_image_ohpc="xdmod-20230629191611" - # - echo $TF_VAR_image_ohpc + - export TF_VAR_image_ohpc="${XDMOD_IMAGES[0]}" + # - export TF_VAR_image_ohpc="xdmod-20230629191611" + - echo $TF_VAR_image_ohpc - terraform apply -auto-approve || terraform destroy -auto-approve clean-up: diff --git a/main.tf b/main.tf index 93945a070afbbc31183482ff4d9a5d2ddbb2c7f9..c0b59fb4c231851848e63135f852fc3da2461765 100644 --- a/main.tf +++ b/main.tf @@ -152,8 +152,8 @@ resource "null_resource" "ops" { provisioner "remote-exec" { inline = [ - "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 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", ] }