Merge lp:~pwlars/charms/xenial/hwcert-pxe-server/hwcert-pxe-server-secure-boot into lp:~canonical-hw-cert/charms/xenial/hwcert-pxe-server/trunk

[Paul Larson]

This adds the shim we need, which also needs some other files like grubnetx64 to be a magic filename in order to work right. I've done these changes manually on the netboot server, but this way they will be in the charm in case it ever needs to be deployed again.

[Paul Larson (pwlars)]

This is in production already, so self-approving

review: Approve

=== modified file 'playbooks/pxeserver.yaml'
--- playbooks/pxeserver.yaml	2017-04-24 03:49:46 +0000
+++ playbooks/pxeserver.yaml	2017-05-10 16:08:08 +0000
@@ -8,6 +8,7 @@
         update_cache=yes
       with_items:
         - pxelinux
+        - shim-signed
         - syslinux
         - tftpd-hpa
       tags:
@@ -91,6 +92,12 @@
         - install
         - upgrade-charm
 
+    - name: copy shimx64.efi.signed to tftpboot dir
+      shell: cp /usr/lib/shim/shimx64.efi.signed /var/lib/tftpboot
+      tags:
+        - install
+        - upgrade-charm
+
     - name: get grubnetx64.efi.signed to /var/lib/tftpboot
       get_url:
         url: http://archive.ubuntu.com/ubuntu/dists/xenial/main/uefi/grub2-amd64/current/grubnetx64.efi.signed
@@ -100,6 +107,12 @@
         - install
         - upgrade-charm
 
+    - name: shim needs grubnetx64.efi.signed named grubx64.efi
+      shell: cp /var/lib/tftpboot/grubnetx64.efi.signed /var/lib/tftpboot/grubx64.efi
+      tags:
+        - install
+        - upgrade-charm
+
     - name: download kernel to /var/lib/tftpboot/boot
       get_url:
         url={{ kernel_url }}