Fix login and backup Add Block Volume

Author: arnaudfroidmont

autoscaling/tf_init/bastion_update.tf

@@ -56,6 +56,8 @@ resource "local_file" "inventory" {
     bastion_block = var.bastion_block,
     scratch_nfs_type = local.scratch_nfs_type,
     bastion_mount_ip = var.bastion_mount_ip,
+    backup_mount_ip = var.backup_mount_ip,
+    login_mount_ip = var.login_mount_ip,
     cluster_mount_ip = local.mount_ip,
     cluster_name = local.cluster_name,
     shape = var.cluster_network ? var.cluster_network_shape : var.instance_pool_shape,

autoscaling/tf_init/inventory.tpl

@@ -43,6 +43,8 @@ spack = ${spack}
 bastion_block = ${bastion_block} 
 scratch_nfs_type = ${scratch_nfs_type}
 bastion_mount_ip = ${bastion_mount_ip}
+backup_mount_ip = ${backup_mount_ip}
+login_mount_ip = ${login_mount_ip}
 cluster_mount_ip = ${cluster_mount_ip}
 autoscaling = true
 force = no

bastion.tf

@@ -266,6 +266,8 @@ resource "null_resource" "cluster" {
       bastion_block = var.bastion_block, 
       scratch_nfs_type = local.scratch_nfs_type,
       bastion_mount_ip = local.bastion_mount_ip,
+      backup_mount_ip = local.backup_mount_ip,
+      login_mount_ip = local.login_mount_ip,
       cluster_mount_ip = local.mount_ip,
       autoscaling = var.autoscaling,
       cluster_name = local.cluster_name,
@@ -390,6 +392,8 @@ resource "null_resource" "cluster" {
       bastion_block = var.bastion_block, 
       scratch_nfs_type = local.scratch_nfs_type,
       bastion_mount_ip = local.bastion_mount_ip,
+      backup_mount_ip = local.backup_mount_ip,
+      login_mount_ip = local.login_mount_ip,
       cluster_mount_ip = local.mount_ip,
       scratch_nfs_type_cluster = var.scratch_nfs_type_cluster,
       scratch_nfs_type_pool = var.scratch_nfs_type_pool,
@@ -403,7 +407,6 @@ resource "null_resource" "cluster" {
       use_cluster_nfs = var.use_cluster_nfs,
       cluster_nfs_path = var.cluster_nfs_path,
       bastion_block = var.bastion_block,
-      bastion_mount_ip = local.bastion_mount_ip,
       home_nfs = var.home_nfs,
       create_fss = var.create_fss,
       home_fss = var.home_fss,

conf/variables.tpl

@@ -101,6 +101,8 @@ variable "ssh_cidr" {default="${ssh_cidr}"}
 variable "bastion_block" {default = "${bastion_block}"}
 
 variable "bastion_mount_ip" {default = "${bastion_mount_ip}"}
+variable "backup_mount_ip" {default = "${backup_mount_ip}"}
+variable "login_mount_ip" {default = "${login_mount_ip}"}
 variable "home_nfs" { default = ${home_nfs} } 
 variable "home_fss" { default = ${home_fss} } 
 variable "latency_check" { default = ${latency_check} } 

inventory.tpl

@@ -37,6 +37,8 @@ spack = ${spack}
 bastion_block = ${bastion_block} 
 scratch_nfs_type = ${scratch_nfs_type}
 bastion_mount_ip = ${bastion_mount_ip}
+backup_mount_ip = ${backup_mount_ip}
+login_mount_ip = ${login_mount_ip}
 cluster_mount_ip = ${cluster_mount_ip}
 autoscaling = ${autoscaling}
 cluster_name = ${cluster_name}

locals.tf

@@ -44,6 +44,8 @@ locals {
   is_instance_pool_flex_shape = length(regexall(".*VM.*.*Flex$", var.instance_pool_shape)) > 0 ? [local.instance_pool_ocpus]:[]
 
   bastion_mount_ip = var.bastion_block ? element(concat(oci_core_volume_attachment.bastion_volume_attachment.*.ipv4, [""]), 0) : "none"
+  backup_mount_ip = var.bastion_block && var.slurm_ha ? element(concat(oci_core_volume_attachment.backup_volume_attachment.*.ipv4, [""]), 0) : "none"
+  login_mount_ip = var.login_block ? element(concat(oci_core_volume_attachment.login_volume_attachment.*.ipv4, [""]), 0) : "none"
 
   scratch_nfs_type = var.cluster_network ? var.scratch_nfs_type_cluster : var.scratch_nfs_type_pool 
 

playbooks/site.yml

@@ -104,6 +104,8 @@
         options: ""
         lock: "none"
       when: add_nfs|bool and home_fss|bool
+    - include_role: 
+        name: passwords
 
 
 - hosts: bastion
@@ -163,9 +165,7 @@
     export_name: "cluster"
     local_path:  "/export/cluster"
     iscsi_ip: "{{ bastion_mount_ip }}"
-  tasks: 
-    - include_role: 
-        name: passwords
+  tasks:
     - include_role: 
         name: iscsi
       when: bastion_block|default(false)|bool
@@ -175,17 +175,26 @@
     - include_role: 
         name: mysql
 
-- hosts: slurm_backup, login
+- hosts: slurm_backup
   become: true
   vars:
-    iscsi_ip: "{{ bastion_mount_ip }}"
+    iscsi_ip: "{{ backup_mount_ip }}"
+    local_path: "{{cluster_nfs_path}}"
   tasks: 
-    - include_role: 
-        name: passwords
     - include_role: 
         name: iscsi
       when: bastion_block|default(false)|bool
 
+- hosts: login
+  become: true
+  vars:
+    iscsi_ip: "{{ login_mount_ip }}"
+    local_path: "{{cluster_nfs_path}}"
+  tasks: 
+    - include_role: 
+        name: iscsi
+      when: login_block|default(false)|bool
+
 - hosts: nfs
   become: true
   vars:

slurm_ha.tf

@@ -230,6 +230,8 @@ resource "null_resource" "cluster_backup" {
       bastion_block = var.bastion_block, 
       scratch_nfs_type = local.scratch_nfs_type,
       bastion_mount_ip = local.bastion_mount_ip,
+      backup_mount_ip = local.backup_mount_ip,
+      login_mount_ip = local.login_mount_ip,
       cluster_mount_ip = local.mount_ip,
       autoscaling = var.autoscaling,
       cluster_name = local.cluster_name,
@@ -354,6 +356,8 @@ resource "null_resource" "cluster_backup" {
       bastion_block = var.bastion_block, 
       scratch_nfs_type = local.scratch_nfs_type,
       bastion_mount_ip = local.bastion_mount_ip,
+      backup_mount_ip = local.backup_mount_ip,
+      login_mount_ip = local.login_mount_ip,
       cluster_mount_ip = local.mount_ip,
       scratch_nfs_type_cluster = var.scratch_nfs_type_cluster,
       scratch_nfs_type_pool = var.scratch_nfs_type_pool,
@@ -367,7 +371,6 @@ resource "null_resource" "cluster_backup" {
       use_cluster_nfs = var.use_cluster_nfs,
       cluster_nfs_path = var.cluster_nfs_path,
       bastion_block = var.bastion_block,
-      bastion_mount_ip = local.bastion_mount_ip,
       home_nfs = var.home_nfs,
       create_fss = var.create_fss,
       home_fss = var.home_fss,