From 3a2472870ec96880695db7133b9b546ae3492bac Mon Sep 17 00:00:00 2001 From: Christian Pape Date: Fri, 15 Jun 2018 09:07:03 -0500 Subject: [PATCH] Fix --- gns3-qemu.json | 8 -------- gns3/create-appliance-file.sh | 2 +- scripts/grafana.sh | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/gns3-qemu.json b/gns3-qemu.json index 2220094..c09dc85 100644 --- a/gns3-qemu.json +++ b/gns3-qemu.json @@ -42,13 +42,6 @@ } ], "post-processors": [ - { - "type": "checksum", - "checksum_types": [ - "md5" - ], - "output": "opennms-horizon/opennms-horizon.qcow2.md5sum" - }, { "type": "compress", "output": "opennms-horizon/opennms-horizon.qcow2.gz" @@ -58,7 +51,6 @@ "inline": [ "cd opennms-horizon", "mv packer-qemu opennms-horizon.qcow2", - "md5sum opennms-horizon.qcow2.gz > opennms-horizon.qcow2.gz.md5sum", "../gns3/create-appliance-file.sh {{user `onms-version`}} > opennms-horizon.log" ] } diff --git a/gns3/create-appliance-file.sh b/gns3/create-appliance-file.sh index 4ce9be0..137b8ac 100755 --- a/gns3/create-appliance-file.sh +++ b/gns3/create-appliance-file.sh @@ -1,7 +1,7 @@ #!/bin/sh VERSION="$1" -MD5SUM="`cat opennms-horizon.qcow2.md5sum | awk '{print $1}'`" +MD5SUM="`md5sum opennms-horizon.qcow2 | awk '{print $1}'`" FILESIZE="`wc -c opennms-horizon.qcow2 | awk '{print $1}'`" echo "Creating new opennms-horizon.gns3a appliance file:" diff --git a/scripts/grafana.sh b/scripts/grafana.sh index 0b86af5..926c438 100644 --- a/scripts/grafana.sh +++ b/scripts/grafana.sh @@ -5,4 +5,4 @@ systemctl start grafana-server firewall-cmd --zone=public --permanent --add-port=3000/tcp sleep 10 -curl 'http://admin:admin@localhost:3000/api/datasources' -X POST -H 'Content-Type:application/json;charset=UTF-8' --data-binary '{"name":"OpenNMS","type":"opennms","access":"proxy","url":"http://localhost:8980/opennms","isDefault":true,"basicAuth":true,"basicAuthUser":"admin","basicAuthPassword":"admin"}' +# curl 'http://admin:admin@localhost:3000/api/datasources' -X POST -H 'Content-Type:application/json;charset=UTF-8' --data-binary '{"name":"OpenNMS","type":"opennms","access":"proxy","url":"http://localhost:8980/opennms","isDefault":true,"basicAuth":true,"basicAuthUser":"admin","basicAuthPassword":"admin"}'