From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 13 Mar 2017 17:47:32 +0000 (-0400)
Subject: Fix JSON linting and add Linter
X-Git-Tag: release/boron-sr3~85^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=releng%2Fbuilder.git;a=commitdiff_plain;h=fedb7c789917cb12b9bf5ea33337694da3954588

Fix JSON linting and add Linter

Add the JSON linter to .coafile so that our JSON files also get linted.

Change-Id: Ic8a73c4e90d359066de157365a66397a82d72e0e
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/.coafile b/.coafile
index 17ba2c494..8d32fd085 100644
--- a/.coafile
+++ b/.coafile
@@ -6,6 +6,11 @@ ignore_length_regex = Signed-off-by,
     http://,
     https://
 
+[JSON]
+bears = JSONFormatBear
+files = **/*.json
+ignore = .*/**
+indent_size = 2
 
 [YAML]
 bears = YAMLLintBear
diff --git a/packer/templates/baseline.json b/packer/templates/baseline.json
index f042b0836..e3e0d0fc1 100644
--- a/packer/templates/baseline.json
+++ b/packer/templates/baseline.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
diff --git a/packer/templates/devstack-pre-pip-mitaka.json b/packer/templates/devstack-pre-pip-mitaka.json
index 25b0244cf..9c2ac20fd 100644
--- a/packer/templates/devstack-pre-pip-mitaka.json
+++ b/packer/templates/devstack-pre-pip-mitaka.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
diff --git a/packer/templates/devstack-pre-pip-newton.json b/packer/templates/devstack-pre-pip-newton.json
index d166632ce..74f89faa9 100644
--- a/packer/templates/devstack-pre-pip-newton.json
+++ b/packer/templates/devstack-pre-pip-newton.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
diff --git a/packer/templates/devstack.json b/packer/templates/devstack.json
index e3fe2b4ac..dc38a5481 100644
--- a/packer/templates/devstack.json
+++ b/packer/templates/devstack.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
diff --git a/packer/templates/docker.json b/packer/templates/docker.json
index 5c19c97b6..5fccb455a 100644
--- a/packer/templates/docker.json
+++ b/packer/templates/docker.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
diff --git a/packer/templates/gbp.json b/packer/templates/gbp.json
index d3816b6ba..b82f468da 100644
--- a/packer/templates/gbp.json
+++ b/packer/templates/gbp.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
@@ -57,7 +55,9 @@
   "provisioners": [
     {
       "type": "shell",
-      "inline": ["mkdir -p /tmp/packer"]
+      "inline": [
+        "mkdir -p /tmp/packer"
+      ]
     },
     {
       "type": "file",
diff --git a/packer/templates/java-builder.json b/packer/templates/java-builder.json
index 30c38b4d6..ef5f42e04 100644
--- a/packer/templates/java-builder.json
+++ b/packer/templates/java-builder.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
diff --git a/packer/templates/mininet-ovs-2.3.json b/packer/templates/mininet-ovs-2.3.json
index 49f29527a..ea2882086 100644
--- a/packer/templates/mininet-ovs-2.3.json
+++ b/packer/templates/mininet-ovs-2.3.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
diff --git a/packer/templates/mininet-ovs-2.5.json b/packer/templates/mininet-ovs-2.5.json
index 02f83807d..204ec4773 100644
--- a/packer/templates/mininet-ovs-2.5.json
+++ b/packer/templates/mininet-ovs-2.5.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
diff --git a/packer/templates/mininet.json b/packer/templates/mininet.json
index 1bb33619b..702f5be15 100644
--- a/packer/templates/mininet.json
+++ b/packer/templates/mininet.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
diff --git a/packer/templates/robot.json b/packer/templates/robot.json
index 790a482a9..d79322dc3 100644
--- a/packer/templates/robot.json
+++ b/packer/templates/robot.json
@@ -7,7 +7,6 @@
     "public_tenant": null,
     "public_user": null,
     "public_pass": null,
-
     "private_base_image": null,
     "private_network": null,
     "private_cloud_user": null,
@@ -15,7 +14,6 @@
     "private_tenant": null,
     "private_user": null,
     "private_pass": null,
-
     "distro": null,
     "cloud_user_data": null
   },
diff --git a/packer/vars/centos.json b/packer/vars/centos.json
index 5602797b1..30c0d4a1a 100644
--- a/packer/vars/centos.json
+++ b/packer/vars/centos.json
@@ -1,10 +1,8 @@
 {
   "public_base_image": "CentOS 7 (PVHVM)",
   "public_cloud_user": "root",
-
   "private_base_image": "CentOS 7 (cloudimg 1510)",
   "private_cloud_user": "centos",
-
   "distro": "CentOS 7",
   "cloud_user_data": "provision/rh-user_data.sh"
 }
diff --git a/packer/vars/cloud-env.json.example b/packer/vars/cloud-env.json.example
index fbdb0750f..efd33d900 100644
--- a/packer/vars/cloud-env.json.example
+++ b/packer/vars/cloud-env.json.example
@@ -1,13 +1,10 @@
 {
   "public_auth_url": "https://identity.api.rackspacecloud.com/v2.0/",
-
   "public_tenant": "TENNANTID",
   "public_user": "USERID",
   "public_pass": "USERPASS",
   "public_network": "cac67a72-aefc-48f8-ae55-9affa3540dd0",
-
   "private_auth_url": "https://privapi.opendaylight.org:5000/v2.0",
-
   "private_tenant": "TENNANTID",
   "private_user": "USERID",
   "private_pass": "USERPASS",
diff --git a/packer/vars/ubuntu-14.04.json b/packer/vars/ubuntu-14.04.json
index 846ab9b22..699fef59e 100644
--- a/packer/vars/ubuntu-14.04.json
+++ b/packer/vars/ubuntu-14.04.json
@@ -1,10 +1,8 @@
 {
   "public_base_image": "Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)",
   "public_cloud_user": "root",
-
   "private_base_image": "Ubuntu 14.04 LTS Trusty Tahr (cloudimg)",
   "private_cloud_user": "ubuntu",
-
   "distro": "Ubuntu 14.04",
   "cloud_user_data": "provision/null_data.sh"
 }
diff --git a/packer/vars/ubuntu-16.04.json b/packer/vars/ubuntu-16.04.json
index ae1154b44..760cd6475 100644
--- a/packer/vars/ubuntu-16.04.json
+++ b/packer/vars/ubuntu-16.04.json
@@ -1,10 +1,8 @@
 {
   "public_base_image": "Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)",
   "public_cloud_user": "root",
-
   "private_base_image": "Ubuntu 16.04 LTS (2016-05-03 cloudimg)",
   "private_cloud_user": "ubuntu",
-
   "distro": "Ubuntu 16.04",
   "cloud_user_data": "provision/null_data.sh"
 }