.gitlab-ci.yml

@@ -137,7 +137,8 @@ production-deploy:
   script:
     - export prod_instance_id=$(openstack floating ip show $prod_floating_ip -c port_details -f value | awk -F', ' '{print $2}' | awk -F"'" '{print $2}')
     - export prod_volume=$(openstack server show $prod_instance_id -c volumes_attached -f value | awk -F"'" '{print $4}')
-    - echo "Detaching prod_volume_id=${prod_volume} from prod_instance_id=${prod_instance_id}"
+    - export prod_queue_volume=$(openstack server show $prod_instance_id -c volumes_attached -f value | awk -F"'" '{print $4}' | awk 'NR==2')
+
     - |
       eval $(ssh-agent -s)
       chmod 400 "${SSH_PRIV_KEY}"
@@ -146,19 +147,37 @@ production-deploy:
       chmod 700 ~/.ssh
     - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$prod_floating_ip sudo systemctl stop mariadb
     - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$prod_floating_ip sudo umount /var/lib/mysql && df -h
+     - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$prod_floating_ip sudo umount /data/xdmod/queues && df -h
     - openstack server remove volume $prod_instance_id $prod_volume
+    - openstack server remove volume $prod_instance_id $prod_queue_volume
     - openstack server stop $prod_instance_id
 
-    - export staging_volume=$(openstack server show $instance_id -c volumes_attached -f value | awk -F"'" '{print $4}')
-    - echo "Detaching staging_volume_id=${staging_volume} from staging_instance_id=${instance_id}"
+    # Exporting Staging Volume IDs
+    - export staging_volume=$(openstack server show $instance_id -c volumes_attached -f value | awk -F"'" '{print $4}' | awk 'NR==1')
+    - export staging_queue_volume=$(openstack server show $instance_id -c volumes_attached -f value | awk -F"'" '{print $4}' | awk 'NR==2')
+
+    # Logging Information
+    - echo "Detaching staging_volume_id=${staging_volume} and staging_queue_volume_id=${staging_queue_volume} from staging_instance_id=${instance_id}"
+
+    # Stopping MariaDB Service on Staging Instance
     - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$staging_floating_ip sudo systemctl stop mariadb
+
+    # Unmounting MySQL Data Directories
     - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$staging_floating_ip sudo umount /var/lib/mysql && df -h
+    - ssh -o StrictHostKeyChecking=no $SSH_USERNAME@$staging_floating_ip sudo umount /data/xdmod/queues && df -h
+
+    # Removing Volumes from Server
     - openstack server remove volume $instance_id $staging_volume
+    - openstack server remove volume $instance_id $staging_queue_volume
 
     - echo "Attach prod volume $xdmod-prod-vol-$BUILD_DATE to staging instance $instance_id"
+    - echo "Attach prod queue volume xdmod-prod-queue-vol-$BUILD_DATE to staging instance $instance_id"
     - openstack volume snapshot create --volume $prod_volume xdmod-prod-data-vol-snapshot-$BUILD_DATE
+    - openstack volume snapshot create --volume $prod_queue_volume xdmod-prod-queue-vol-snapshot-$BUILD_DATE
     - openstack volume create --snapshot xdmod-prod-data-vol-snapshot-$BUILD_DATE --size 150 xdmod-prod-vol-$BUILD_DATE
+    - openstack volume create --snapshot xdmod-prod-queue-vol-snapshot-$BUILD_DATE --size 1 xdmod-prod-queue-vol-$BUILD_DATE
     - openstack server add volume $instance_id xdmod-prod-vol-$BUILD_DATE --device /dev/vdb
+    - openstack server add volume $instance_id xdmod-prod-queue-vol-$BUILD_DATE --device /dev/vdc
 
     - echo "swap the floating IP between prod and staging instances"
     - openstack server remove floating ip $prod_instance_id $prod_floating_ip

main.tf

@@ -56,6 +56,7 @@ output "keypair_name" {
 
 data "openstack_networking_network_v2" "external_net" {name = var.external_network}
 data "openstack_blockstorage_volume_v3" "disk" {name = var.data_volume}
+data "openstack_blockstorage_volume_v3" "disk2" {name = var.xdmod_queue_data_volume}
 
 # runs the ohpc-instance module - creates ohpc instance using variables defined above
 # calls functions from dmz-network, import-keypair, and floating-ip-address modules to get values created there for use
@@ -71,7 +72,10 @@ module "create-ohpc-instance" {
     floating_ip_ohpc = module.floating-ip-address.ohpc_address
     ohpc_user =  var.ohpc_user
     ssh_private_key = var.ssh_private_key
-    vol_id = data.openstack_blockstorage_volume_v3.disk.id
+    vol_ids = [
+      data.openstack_blockstorage_volume_v3.disk.id,
+      data.openstack_blockstorage_volume_v3.disk2.id,
+    ]
 }
 
 # runs the ood-instance module - creates ood instance using variables defined above
@@ -150,6 +154,7 @@ provisioner "remote-exec" {
 provisioner "remote-exec" {
     inline = [
       "sudo mount ${module.create-ohpc-instance.device}1 /var/lib/mysql",
+      "sudo mount ${module.create-ohpc-instance.device}2 /data/xdmod/queues",
       "sudo df -h",
       "sudo systemctl restart mariadb",
     ]

ohpc-instance/main.tf

@@ -26,7 +26,10 @@ variable "floating_ip_ohpc" {type = string}
 
 variable "ohpc_user" {}
 variable "ssh_private_key" {}
-variable "vol_id" {}
+variable "vol_ids" {
+  type    = list(string)
+  default = []
+}
 
 # creates details for the OHPC instance
 resource "openstack_compute_instance_v2" "ohpc" {
@@ -63,8 +66,9 @@ resource "openstack_compute_floatingip_associate_v2" "ohpc" {
 
 # Attach a volume
 resource "openstack_compute_volume_attach_v2" "volume_attach" {
+  count       = length(var.vol_ids)
   instance_id = openstack_compute_instance_v2.ohpc.id
-  volume_id   = var.vol_id
+  volume_id   = var.vol_ids[count.index]
 }
 
 output "xdmod_instance_id" {
@@ -76,5 +80,5 @@ output "ssh_host" {
 }
 
 output "device" {
-    value = openstack_compute_volume_attach_v2.volume_attach.device
+    value = openstack_compute_volume_attach_v2.volume_attach[count.index].device
 }

vars.tf

@@ -26,6 +26,7 @@ variable "ohpc_user" {default = "centos"}
 variable "ood_user" {default = "centos"}
 variable "ssh_private_key" {default = "~/.ssh/id_rsa"}
 variable "data_volume" {default = ""}
+variable "xdmod_queue_data_volume" {default = "xdmod_queue_data_volume"}
 
 # variables for node creation module
 variable "image_compute" {default = "compute-v1"}