Use AIO TF conf

Author: Alex-Welsh

.github/workflows/overcloud-host-image-build.yml

@@ -101,29 +101,47 @@ jobs:
 
       - name: Initialise terraform
         run: terraform init
-        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/host-image-builder
+        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
 
       - name: Generate SSH keypair
         run: ssh-keygen -f id_rsa -N ''
-        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/host-image-builder
+        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
 
       - name: Generate clouds.yaml
         run: |
           cat << EOF > clouds.yaml
           ${{ secrets.CLOUDS_YAML }}
           EOF
-        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/host-image-builder
-
-      - name: Add tags to tfvars file
-        run: |
-          echo -e '\nhost_image_builder_tags = ${{ env.VM_TAGS }}' >> terraform.tfvars
-        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/host-image-builder
+        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
+
+      - name: Generate terraform.tfvars
+        run: |
+          cat << EOF > terraform.tfvars
+          ssh_public_key = "id_rsa.pub"
+          ssh_username = "rocky"
+          aio_vm_name = "skc-host-image-builder"
+          # Must be a Rocky Linux 9 host to successfully build all images
+          # This MUST NOT be an LVM image. It can cause confusing conficts with the built image.
+          aio_vm_image = "Rocky-9-GenericCloud-Base-9.3-20231113.0.x86_64.qcow2"
+          aio_vm_flavor = "en1.medium"
+          aio_vm_network = "stackhpc-ci"
+          aio_vm_subnet = "stackhpc-ci"
+          aio_vm_interface = "eth0"
+          EOF
+        working-directory: ${{ github.workspace }}src/kayobe-config/terraform/aio
         env:
+          SSH_USERNAME: "id_rsa.pub"
+          VM_NAME: "skc-host-image-builder-${{ github.run_id }}"
+          VM_IMAGE: 
+          VM_FLAVOR: 
+          VM_NETWORK: 
+          VM_SUBNET: 
+          VM_INTERFACE: ${{ inputs.vm_interface }}
           VM_TAGS: '["skc-host-image-build", "ref=${{ github.ref_name }}"]'
 
       - name: Terraform Plan
         run: terraform plan
-        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/host-image-builder
+        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
         env:
           OS_CLOUD: "openstack"
           OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
@@ -143,7 +161,7 @@ jobs:
           done
           echo "Failed to create infrastructure after $attempt attempts"
           exit 1
-        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/host-image-builder
+        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
         env:
           OS_CLOUD: "openstack"
           OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
@@ -153,7 +171,7 @@ jobs:
         id: tf_outputs
         run: |
           terraform output -json
-        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/host-image-builder
+        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
 
       - name: Write Terraform outputs
         run: |
@@ -182,8 +200,8 @@ jobs:
         run: |
           mkdir -p ~/.ssh
           touch ~/.ssh/authorized_keys
-          cat src/kayobe-config/terraform/host-image-builder/id_rsa.pub >> ~/.ssh/authorized_keys
-          cp src/kayobe-config/terraform/host-image-builder/id_rsa* ~/.ssh/
+          cat src/kayobe-config/terraform/aio/id_rsa.pub >> ~/.ssh/authorized_keys
+          cp src/kayobe-config/terraform/aio/id_rsa* ~/.ssh/
 
       - name: Bootstrap the control host
         run: |
@@ -501,7 +519,7 @@ jobs:
 
       - name: Destroy
         run: terraform destroy -auto-approve
-        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/host-image-builder
+        working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
         env:
           OS_CLOUD: openstack
           OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}