Merge pull request #255 from stackhpc/fix/fatimage

Use environment hooks when building "fat" image

Author: sjpb

ansible/fatimage.yml

@@ -1,7 +1,21 @@
 # Builder version of site.yml just installing binaries
 
+- name: Run pre.yml hook
+  vars:
+    appliances_environment_root: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}"
+    hook_path: "{{ appliances_environment_root }}/hooks/pre.yml"
+  import_playbook: "{{ hook_path if hook_path | exists else 'noop.yml' }}"
+  when: hook_path | exists
+
 - import_playbook: bootstrap.yml
 
+- name: Run post-bootstrap.yml hook
+  vars:
+    appliances_environment_root: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}"
+    hook_path: "{{ appliances_environment_root }}/hooks/post-bootstrap.yml"
+  import_playbook: "{{ hook_path if hook_path | exists else 'noop.yml' }}"
+  when: hook_path | exists
+
 - hosts: builder
   become: yes
   gather_facts: no
@@ -118,6 +132,17 @@
 
     # - import_playbook: iam.yml - nothing to do
 
+- name: Run post.yml hook
+  vars:
+    appliances_environment_root: "{{ lookup('env', 'APPLIANCES_ENVIRONMENT_ROOT') }}"
+    hook_path: "{{ appliances_environment_root }}/hooks/post.yml"
+  import_playbook: "{{ hook_path if hook_path | exists else 'noop.yml' }}"
+  when: hook_path | exists
+
+- hosts: builder
+  become: yes
+  gather_facts: no
+  tasks:
     - name: Cleanup image
       import_tasks: cleanup.yml
 

environments/.stackhpc/hooks/pre.yml

@@ -1,4 +1,4 @@
-- hosts: control
+- hosts: control:!builder
   become: yes
   gather_facts: false
   tasks:

packer/README.md

@@ -39,7 +39,7 @@ Building an environment-specific compute node image will[^1] require a cluster t
 - Build images using the variable definition file:
 
         cd packer
-        PACKER_LOG=1 /usr/bin/packer build -except openstack.fatimage --on-error=ask -var-file=$PKR_VAR_environment_root/builder.pkrvars.hcl openstack.pkr.hcl
+        PACKER_LOG=1 /usr/bin/packer build -except openstack.openhpc --on-error=ask -var-file=$PKR_VAR_environment_root/builder.pkrvars.hcl openstack.pkr.hcl
 
   Note the builder VMs are added to the `builder` group to differentiate them from "real" nodes - see developer notes below.