From 73a27f990ed23d732d0cfdb22a248824aae355fd Mon Sep 17 00:00:00 2001
From: Christian Pape <Christian.Pape@informatik.hs-fulda.de>
Date: Wed, 13 Jun 2018 15:38:53 -0500
Subject: [PATCH] Fix

---
 .gitignore                      |  4 ++--
 appliance/opennms-horizon.gns3a | 14 +++++++-------
 gns3-qemu.json                  | 14 +++++++++-----
 gns3-vmware.json                |  2 +-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index b62fe3f..4d94a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-output-vmware-iso
-output-qemu
+opennms-horizon
+opennms-horizon-vmware
 packer_cache
 .DS_Store
 appliance/*
diff --git a/appliance/opennms-horizon.gns3a b/appliance/opennms-horizon.gns3a
index cc07c6e..bc05dde 100644
--- a/appliance/opennms-horizon.gns3a
+++ b/appliance/opennms-horizon.gns3a
@@ -5,19 +5,19 @@
     "description": "OpenNMS is a carrier-grade, highly integrated, open source platform designed for building network monitoring solutions.", 
     "images": [
         {
-            "md5sum": "1cc762666508f7c57f7a857f292b0bc6", 
-            "download_url": "http://opennms.org/opennms-qemu-stable.qcow2", 
-            "filename": "opennms-qemu-stable.qcow2", 
-            "version": "22.0.0.-1", 
-            "filesize": 4830068736
+            "md5sum": "${md5sum}", 
+            "download_url": "http://opennms.org/opennms-horizon.qcow2", 
+            "filename": "opennms-horizon.qcow2", 
+            "version": "${version}", 
+            "filesize": ${filesize}
         }
     ], 
     "versions": [
         {
             "images": {
-                "hda_disk_image": "opennms-qemu-stable.qcow2"
+                "hda_disk_image": "opennms-horizon.qcow2"
             }, 
-            "name": "22.0.0-1"
+            "name": "${version}"
         }
     ], 
     "product_name": "OpenNMS Horizon", 
diff --git a/gns3-qemu.json b/gns3-qemu.json
index 69d3b38..9875268 100644
--- a/gns3-qemu.json
+++ b/gns3-qemu.json
@@ -7,7 +7,7 @@
   "builders": [
     {
       "type": "qemu",
-      "output_directory": "opennms-qemu-stable",
+      "output_directory": "opennms-horizon",
       "accelerator": "kvm",
       "boot_command": [
         "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>"
@@ -44,12 +44,16 @@
   "post-processors": [
     {
       "type": "compress",
-      "output": "opennms-qemu-stable/opennms-qemu-stable.qcow2.gz"
+      "output": "opennms-horizon/opennms-horizon.qcow2.gz"
     },
     {
-      "type": "checksum",
-      "checksum_types": "md5",
-      "output": "opennms-qemu-stable/opennms-qemu-stable.qcow2.gz.md5sum"
+      "type": "shell-local",
+      "inline": [
+        "cd opennms-horizon", 
+        "md5sum opennms-horizon.qcow2.gz > opennms-horizon.qcow2.gz.md5sum", 
+        "../appliance/create-appliance.sh {{user `onms-version`}} > opennms-horizon.log", 
+        "rm packer-qemu"
+      ]
     }
   ]
 }
diff --git a/gns3-vmware.json b/gns3-vmware.json
index 26d2c58..a2462fc 100644
--- a/gns3-vmware.json
+++ b/gns3-vmware.json
@@ -7,7 +7,7 @@
   "builders": [
     {
       "type": "vmware-iso",
-      "output_directory": "opennms-vmware-stable",
+      "output_directory": "opennms-horizon-vmware",
       "boot_command": [
         "<tab> text ks=http://{{ .HTTPIP }}:{{ .HTTPPort }}/ks.cfg<enter><wait>"
       ],