From eaf3b9d03084c2ab32c834b2e027d4db18a5c28b Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Tue, 16 Feb 2016 23:18:05 +0100
Subject: [PATCH] MT#17213 Update goss to 0.0.22

The ip field format has been changed in 0.0.17:
> https://github.com/aelsabbahy/goss/issues/27#issuecomment-167676745

Change-Id: I433712401f330f604ceebe76deb9774409aeeca8
---
 ce/03_open_ports.json.tt2  |  4 +--
 pro/03_open_ports.json.tt2 | 56 +++++++++++++++++++-------------------
 testrunner                 |  2 +-
 3 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/ce/03_open_ports.json.tt2 b/ce/03_open_ports.json.tt2
index d609bf8..c32acbf 100644
--- a/ce/03_open_ports.json.tt2
+++ b/ce/03_open_ports.json.tt2
@@ -13,11 +13,11 @@
     "port": {
         "tcp:443": {
             "listening": true,
-            "ip": "[% web_ext_ips.0 -%]"
+            "ip": ["[% web_ext_ips.0 -%]"]
         },
         "tcp:1443": {
             "listening": true,
-            "ip": "[% web_int_ips.0 -%]"
+            "ip": ["[% web_int_ips.0 -%]"]
         }
     }
 }
diff --git a/pro/03_open_ports.json.tt2 b/pro/03_open_ports.json.tt2
index aecf704..c7208a3 100644
--- a/pro/03_open_ports.json.tt2
+++ b/pro/03_open_ports.json.tt2
@@ -58,103 +58,103 @@
 [% IF is_mgmt -%]
         "tcp:443": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "tcp:1443": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
 [% END -%]
 [% IF is_mgmt && pbx.enable == 'yes' -%]
         "tcp:1444": {
             "listening": true,
-            "ip": "[% web_ext_ips.0 -%]"
+            "ip": ["[% web_ext_ips.0 -%]"]
         },
         "tcp:1445": {
             "listening": true,
-            "ip": "[% web_ext_ips.0 -%]"
+            "ip": ["[% web_ext_ips.0 -%]"]
         },
 [% END -%]
         "tcp:22": {
             "listening": true,
-            "ip": "0.0.0.0"
+            "ip": ["0.0.0.0"]
         },
         "tcp:22": {
             "listening": true,
-            "ip": "[% hosts.$hostname.$host_ha_iface.ip %]"
+            "ip": ["[% hosts.$hostname.$host_ha_iface.ip %]"]
         },
         "tcp:24009": {
             "listening": true,
-            "ip": "0.0.0.0"
+            "ip": ["0.0.0.0"]
         },
         "tcp:25": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "tcp:2812": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "tcp:3306": {
             "listening": true,
-            "ip": "0.0.0.0"
+            "ip": ["0.0.0.0"]
         },
 [% IF is_lb -%]
         "tcp:5060": {
             "listening": true,
-            "ip": "[% sip_ext_ips.0 -%]"
+            "ip": ["[% sip_ext_ips.0 -%]"]
         },
 [% END -%]
 [% IF is_proxy -%]
         "tcp:5062": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "tcp:5222": {
             "listening": true,
-            "ip": "[% sip_ext_ips.0 -%]"
+            "ip": ["[% sip_ext_ips.0 -%]"]
         },
         "tcp:5269": {
             "listening": true,
-            "ip": "[% sip_ext_ips.0 -%]"
+            "ip": ["[% sip_ext_ips.0 -%]"]
         },
         "tcp:5280": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "tcp:5281": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "tcp:5582": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "tcp:8090": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "tcp:5038": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "udp:5040": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "udp:5070": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
         "udp:5080": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
 [% END -%]
 [% IF is_rtp || is_proxy || is_db -%]
         "tcp:6379": {
             "listening": true,
-            "ip": "[% hosts.$hostname.$host_ha_iface.ip %]"
+            "ip": ["[% hosts.$hostname.$host_ha_iface.ip %]"]
         },
 [% END -%]
         "tcp:7777": {
@@ -165,25 +165,25 @@
         },
         "udp:123": {
             "listening": true,
-            "ip": "0.0.0.0"
+            "ip": ["0.0.0.0"]
         },
         "udp:161": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
 [% IF is_rtp -%]
         "udp:2223": {
             "listening": true,
-            "ip": "127.0.0.1"
+            "ip": ["127.0.0.1"]
         },
 [% END -%]
         "udp:25826": {
             "listening": true,
-            "ip": "[% hosts.$hostname.$host_ha_iface.ip %]"
+            "ip": ["[% hosts.$hostname.$host_ha_iface.ip %]"]
         },
         "udp:[% heartbeat.port ? heartbeat.port : '694' %]": {
             "listening": true,
-            "ip": "0.0.0.0"
+            "ip": ["0.0.0.0"]
         },
         "tcp:22": {
             "listening": true,
diff --git a/testrunner b/testrunner
index e2caa25..bd50a80 100755
--- a/testrunner
+++ b/testrunner
@@ -22,7 +22,7 @@ esac
 
 if [ ! -x /usr/sbin/goss ] ; then
   echo "Downloading goss and installing as /usr/sbin/goss"
-  curl -L https://deb.sipwise.com/files/goss-0.0.16-linux-amd64 > /usr/sbin/goss
+  curl -L https://deb.sipwise.com/files/goss-0.0.22-linux-amd64 > /usr/sbin/goss
   chmod +x /usr/sbin/goss
 fi