Re-use cluster_infra role for image-build infra

Author: m-bull

roles/cluster_infra/tasks/main.yml

@@ -73,7 +73,9 @@
               else 'vd'
            }}
   # Only run when block_device_prefix isn't set as an extravar
-  when: block_device_prefix is not defined
+  when:
+    - block_device_prefix is not defined
+    - cluster_image is defined
 
 
 - name: Template Terraform files into project directory

roles/image_build/defaults/main.yml

@@ -1,15 +1,4 @@
 ---
-image_build_terraform_project_path: "{{ playbook_dir }}/terraform-image-build"
-image_build_cluster_id: "image-build"
-
-# Regex to capture existing cloud image names to use as the
-# OpenHPC Slurm base-image
-image_build_existing_image_regex: "^Rocky-8-GenericCloud-Base-8.7-.*"
-# Attributes to sort the list of existing base images returned by
-# image_build_existing_image_regex. See
-# https://registry.terraform.io/providers/terraform-provider-openstack/openstack/latest/docs/data-sources/images_image_ids_v2#sort
-image_build_existing_image_sort_attributes: "name,updated_at"
-
 # Attach a floating IP to the Packer build instance
 image_build_attach_floating_ip: false
 

roles/image_build_infra/defaults/main.yml

@@ -1,4 +1,5 @@
 ---
+
 image_build_terraform_project_path: "{{ playbook_dir }}/terraform-image-build"
 image_build_cluster_id: "image-build"
 

roles/image_build_infra/tasks/main.yml

@@ -1,39 +1,16 @@
 ---
-- debug:
-    msg: |
-      terraform_backend_type: {{ terraform_backend_type }}
-      terraform_state: {{ terraform_state }}
-
-- name: Install Terraform binary
-  include_role:
-    name: stackhpc.terraform.install
-
-- name: Make Terraform project directory
-  file:
-    path: "{{ image_build_terraform_project_path }}"
-    state: directory
-
-- name: Write backend configuration
-  copy:
-    content: |
-      terraform {
-        backend "{{ terraform_backend_type }}" { }
-      }
-    dest: "{{ image_build_terraform_project_path }}/backend.tf"
-
-- name: Template Terraform files into project directory
-  template:
-    src: "{{ item }}.j2"
-    dest: "{{ image_build_terraform_project_path }}/{{ item }}"
-  loop:
-    - outputs.tf
-    - providers.tf
-    - resources.tf
+- name: Get path to the image-buid Terraform templates directory
+  set_fact:
+    image_build_terraform_template_dir: "{{ role_path }}/templates"
 
-- name: Provision infrastructure
+- name: Run cluster_infra role with image-build terraform template
   include_role:
-    name: stackhpc.terraform.infra
+    name: cluster_infra
+    public: true
   vars:
+    cluster_id: "{{ image_build_cluster_id }}"
+    cluster_name: "{{ image_build_cluster_id }}"
+    cluster_terraform_template_dir: "{{ image_build_terraform_template_dir }}"
     terraform_project_path: "{{ image_build_terraform_project_path }}"
 
 - name: Set image build infrastructure facts