Add fixes for block volumes on login and backup

Author: arnaudfroidmont

autoscaling/tf_init/bastion_update.tf

@@ -54,6 +54,7 @@ resource "local_file" "inventory" {
     spack = var.spack,
     ldap = var.ldap,
     bastion_block = var.bastion_block,
+    login_block = var.login_block,
     scratch_nfs_type = local.scratch_nfs_type,
     bastion_mount_ip = var.bastion_mount_ip,
     backup_mount_ip = var.backup_mount_ip,

autoscaling/tf_init/inventory.tpl

@@ -41,6 +41,7 @@ pyxis = ${pyxis}
 enroot = ${enroot}
 spack = ${spack} 
 bastion_block = ${bastion_block} 
+login_block = ${login_block} 
 scratch_nfs_type = ${scratch_nfs_type}
 bastion_mount_ip = ${bastion_mount_ip}
 backup_mount_ip = ${backup_mount_ip}

bastion.tf

@@ -264,6 +264,7 @@ resource "null_resource" "cluster" {
       spack = var.spack,
       ldap = var.ldap,
       bastion_block = var.bastion_block, 
+      login_block = var.login_block, 
       scratch_nfs_type = local.scratch_nfs_type,
       bastion_mount_ip = local.bastion_mount_ip,
       backup_mount_ip = local.backup_mount_ip,
@@ -390,6 +391,7 @@ resource "null_resource" "cluster" {
       spack = var.spack,
       ldap = var.ldap,
       bastion_block = var.bastion_block, 
+      login_block = var.login_block, 
       scratch_nfs_type = local.scratch_nfs_type,
       bastion_mount_ip = local.bastion_mount_ip,
       backup_mount_ip = local.backup_mount_ip,
@@ -406,7 +408,6 @@ resource "null_resource" "cluster" {
       ssh_cidr = var.ssh_cidr,
       use_cluster_nfs = var.use_cluster_nfs,
       cluster_nfs_path = var.cluster_nfs_path,
-      bastion_block = var.bastion_block,
       home_nfs = var.home_nfs,
       create_fss = var.create_fss,
       home_fss = var.home_fss,

conf/variables.tpl

@@ -99,6 +99,7 @@ variable "cluster_block_volume_performance" {default="${cluster_block_volume_per
 
 variable "ssh_cidr" {default="${ssh_cidr}"}
 variable "bastion_block" {default = "${bastion_block}"}
+variable "login_block" {default = "${login_block}"}
 
 variable "bastion_mount_ip" {default = "${bastion_mount_ip}"}
 variable "backup_mount_ip" {default = "${backup_mount_ip}"}

inventory.tpl

@@ -35,6 +35,7 @@ slurm = ${slurm}
 rack_aware = ${rack_aware}
 spack = ${spack} 
 bastion_block = ${bastion_block} 
+login_block = ${login_block}
 scratch_nfs_type = ${scratch_nfs_type}
 bastion_mount_ip = ${bastion_mount_ip}
 backup_mount_ip = ${backup_mount_ip}

playbooks/site.yml

@@ -179,7 +179,7 @@
   become: true
   vars:
     iscsi_ip: "{{ backup_mount_ip }}"
-    local_path: "{{cluster_nfs_path}}"
+    local_path: "/mnt/block"
   tasks: 
     - include_role: 
         name: iscsi
@@ -189,7 +189,7 @@
   become: true
   vars:
     iscsi_ip: "{{ login_mount_ip }}"
-    local_path: "{{cluster_nfs_path}}"
+    local_path: "/mnt/block"
   tasks: 
     - include_role: 
         name: iscsi

slurm_ha.tf

@@ -228,6 +228,7 @@ resource "null_resource" "cluster_backup" {
       spack = var.spack,
       ldap = var.ldap,
       bastion_block = var.bastion_block, 
+      login_block = var.login_block, 
       scratch_nfs_type = local.scratch_nfs_type,
       bastion_mount_ip = local.bastion_mount_ip,
       backup_mount_ip = local.backup_mount_ip,
@@ -354,6 +355,7 @@ resource "null_resource" "cluster_backup" {
       spack = var.spack,
       ldap = var.ldap,
       bastion_block = var.bastion_block, 
+      login_block = var.login_block, 
       scratch_nfs_type = local.scratch_nfs_type,
       bastion_mount_ip = local.bastion_mount_ip,
       backup_mount_ip = local.backup_mount_ip,
@@ -370,7 +372,6 @@ resource "null_resource" "cluster_backup" {
       ssh_cidr = var.ssh_cidr,
       use_cluster_nfs = var.use_cluster_nfs,
       cluster_nfs_path = var.cluster_nfs_path,
-      bastion_block = var.bastion_block,
       home_nfs = var.home_nfs,
       create_fss = var.create_fss,
       home_fss = var.home_fss,