From 374c7577d8debd58dbb543047f7f82daaa9a5ee8 Mon Sep 17 00:00:00 2001
From: Mason Packard <mason.packard@yahoo.com>
Date: Fri, 30 Sep 2016 15:56:54 -0400
Subject: [PATCH] Refactor shibboleth appliance build for more robust appliance
 name.

---
 shibboleth-appliance.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shibboleth-appliance.json b/shibboleth-appliance.json
index 12a1b39..2343099 100644
--- a/shibboleth-appliance.json
+++ b/shibboleth-appliance.json
@@ -60,7 +60,7 @@
     },
     {
         "type": "vmware-iso",
-        "name": "shibboleth-appliance-centos7-vmx",
+        "name": "{{user `outputfile_name`}}-vmx",
         "vm_name": "shibboleth-appliance-centos7-{{user `profile`}}",
         "headless": true,
         "guest_os_type": "RedHat",
@@ -88,31 +88,31 @@
   "post-processors": [
     {
       "type": "compress",
-      "only": ["shibboleth-appliance-centos7-ova"],
+      "only": ["{{user `outputfile_name`}}-ova"],
       "compression_level": "9",
       "output": "builds/{{user `outputfile_name`}}-ova-{{user `timestamper`}}.tar"
     },
     {
       "type": "vagrant",
-      "only": ["shibboleth-appliance-centos7-ova"],
+      "only": ["{{user `outputfile_name`}}-ova"],
       "compression_level": "9",
       "output": "builds/{{user `outputfile_name`}}-ova-vagrant-{{user `timestamper`}}.tar"
     },
     {
       "type": "compress",
-      "only": ["shibboleth-appliance-centos7-vmx"],
+      "only": ["{{user `outputfile_name`}}-vmx"],
       "compression_level": "9",
       "output": "builds/{{user `outputfile_name`}}-vmx-vmware-{{user `timestamper`}}.tar"
     },
     {
       "type": "vagrant",
-      "only": ["shibboleth-appliance-centos7-vmx"],
+      "only": ["{{user `outputfile_name`}}-vmx"],
       "compression_level": "9",
       "output": "builds/{{user `outputfile_name`}}-vagrant-vmware-{{user `timestamper`}}.tar"
     },
     {
       "type": "amazon-import",
-      "only": ["shibboleth-appliance-centos7-ova"],
+      "only": ["{{user `outputfile_name`}}-ova"],
       "access_key": "{{user `aws_access_key`}}",
       "secret_key": "{{user `aws_secret_key`}}",
       "region": "{{user `region`}}",