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 17ba2c49432410c43e2673947e7e0575d5f39b43..8d32fd0851d96ac72c4d30720210daff815f18d8 100644 (file)
--- 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 f042b0836d026babfadaf8ef9c78f698461e7adf..e3e0d0fc170b7a8f67c34299a9dcda3b6d479976 100644 (file)
--- 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 25b0244cf2a01b622ca0e772bcf5268b34c62de4..9c2ac20fdbc300cb6a6fd60b0a85eebb06b7b6b8 100644 (file)
--- 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 d166632ce695a4268fc080273263da5e7b8dad99..74f89faa9e105d5869d13323a91d568b0bec9fa1 100644 (file)
--- 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 e3fe2b4ac294dd5d4bd88722025371d90d6e1572..dc38a548161e94a697b0782e89b644d30d303538 100644 (file)
--- 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 5c19c97b60879650d3b0598d6a1ad97dfea1d2ff..5fccb455aa46d95c0c5f1b2a37c32aca63d380ae 100644 (file)
--- 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 d3816b6ba57edc7e1ea25cd98cefcec8efef82b5..b82f468dafdbbcc90df6776e05a00ab90176ab2b 100644 (file)
--- 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 30c38b4d6603ef713bba5787a6cd32327620f903..ef5f42e0453e3340c13f34d243b58b8d76583eca 100644 (file)
--- 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 49f29527a243f526256063d97841eb1d0a03dcf2..ea2882086495292bff6897cfb4ef183741dd3e36 100644 (file)
--- 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 02f83807d251e49470b9fb55ae7042efadc65e42..204ec4773d422e9628d4241ce560126dacbca60c 100644 (file)
--- 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 1bb33619b2d5552f0e61952bee3a4b8b9b5ebf07..702f5be15b6206791927f0832cee935e0c9a4c22 100644 (file)
--- 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 790a482a9ebe13d0a09a75c429b1ad196a63f7d3..d79322dc390ce544198122b1fa1fcf5b2641f428 100644 (file)
--- 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 5602797b11bae85c63de2b0f24243b96c16b9396..30c0d4a1a2628158289ac6b08ea96eb41a27182e 100644 (file)
--- 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 fbdb0750f29115e595f6ccf260260d4ac0fe5912..efd33d900c38bc79a28a36d98e6793470fdf46b5 100644 (file)
--- 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 846ab9b229c429f4d58fdddf6d529a64ae09a61a..699fef59e8ff7e7fcf5591c7b3bc0818724f1d78 100644 (file)
--- 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 ae1154b44af6b7c15114106655a4afb6347cac68..760cd6475226bc481407a77c2ea27cf0a7facf0a 100644 (file)
--- 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"
 }