Validate JSON

Let's get that quickly so we can add a gate. There was some respacing
along the way (used http://jsonlint.com)

Change-Id: Id18b9f9757306cf3f06e6221a21a9f600db1bd2e

5 files changed, 242 insertions, 220 deletions

diff --git a/docker/glance/glance.json b/docker/glance/glance.json
index 31279e08d..26f31d24f 100644
--- a/docker/glance/glance.json
+++ b/docker/glance/glance.json
@@ -1,56 +1,60 @@
 {
-  "id": "glance",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "glance-1",
-      "containers": [
-        {
-          "name": "glance-registry",
-          "image": "kollaglue/fedora-rdo-glance-registry",
-          "ports": [
-            {"containerPort": 9191},
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "GLANCE_DB_PASSWORD",
-              "value": "glancedbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        },
-        {
-          "name": "glance-api",
-          "image": "kollaglue/fedora-rdo-glance-api",
-          "ports": [
-            {"containerPort": 9292}
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "GLANCE_DB_PASSWORD",
-              "value": "glancedbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        },
-      ]
+    "id": "glance",
+    "desiredState": {
+        "manifest": {
+            "version": "v1beta1",
+            "id": "glance-1",
+            "containers": [
+                {
+                    "name": "glance-registry",
+                    "image": "kollaglue/fedora-rdo-glance-registry",
+                    "ports": [
+                        {
+                            "containerPort": 9191
+                        }
+                    ],
+                    "env": [
+                        {
+                            "name": "DB_ROOT_PASSWORD",
+                            "value": "password"
+                        },
+                        {
+                            "name": "GLANCE_DB_PASSWORD",
+                            "value": "glancedbpassword"
+                        },
+                        {
+                            "name": "KEYSTONE_ADMIN_TOKEN",
+                            "value": "ADMINTOKEN"
+                        }
+                    ]
+                },
+                {
+                    "name": "glance-api",
+                    "image": "kollaglue/fedora-rdo-glance-api",
+                    "ports": [
+                        {
+                            "containerPort": 9292
+                        }
+                    ],
+                    "env": [
+                        {
+                            "name": "DB_ROOT_PASSWORD",
+                            "value": "password"
+                        },
+                        {
+                            "name": "GLANCE_DB_PASSWORD",
+                            "value": "glancedbpassword"
+                        },
+                        {
+                            "name": "KEYSTONE_ADMIN_TOKEN",
+                            "value": "ADMINTOKEN"
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    "labels": {
+        "name": "glance-master"
     }
-  },
-  "labels": {
-    "name": "glance-master"
-  }
 }
diff --git a/docker/heat/heat.json b/docker/heat/heat.json
index f11233773..dcdbcd523 100644
--- a/docker/heat/heat.json
+++ b/docker/heat/heat.json
@@ -1,56 +1,60 @@
 {
-  "id": "heat",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "heat-1",
-      "containers": [
-        {
-          "name": "heat-engine",
-          "image": "fedora-rdo-heat-engine",
-          "ports": [
-            {"containerPort": 9292}
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "HEAT_DB_PASSWORD",
-              "value": "heatdbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        },
-        {
-          "name": "heat-api",
-          "image": "fedora-rdo-heat-api",
-          "ports": [
-            {"containerPort": 9292},
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "HEAT_DB_PASSWORD",
-              "value": "heatdbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
+    "id": "heat",
+    "desiredState": {
+        "manifest": {
+            "version": "v1beta1",
+            "id": "heat-1",
+            "containers": [
+                {
+                    "name": "heat-engine",
+                    "image": "fedora-rdo-heat-engine",
+                    "ports": [
+                        {
+                            "containerPort": 9292
+                        }
+                    ],
+                    "env": [
+                        {
+                            "name": "DB_ROOT_PASSWORD",
+                            "value": "password"
+                        },
+                        {
+                            "name": "HEAT_DB_PASSWORD",
+                            "value": "heatdbpassword"
+                        },
+                        {
+                            "name": "KEYSTONE_ADMIN_TOKEN",
+                            "value": "ADMINTOKEN"
+                        }
+                    ]
+                },
+                {
+                    "name": "heat-api",
+                    "image": "fedora-rdo-heat-api",
+                    "ports": [
+                        {
+                            "containerPort": 9292
+                        }
+                    ],
+                    "env": [
+                        {
+                            "name": "DB_ROOT_PASSWORD",
+                            "value": "password"
+                        },
+                        {
+                            "name": "HEAT_DB_PASSWORD",
+                            "value": "heatdbpassword"
+                        },
+                        {
+                            "name": "KEYSTONE_ADMIN_TOKEN",
+                            "value": "ADMINTOKEN"
+                        }
+                    ]
+                }
+            ]
         }
-      ]
+    },
+    "labels": {
+        "name": "keystone-master"
     }
-  },
-  "labels": {
-    "name": "keystone-master"
-  }
 }
diff --git a/docker/mariadb/mariadb.json b/docker/mariadb/mariadb.json
index 543b2f270..66e696a0c 100644
--- a/docker/mariadb/mariadb.json
+++ b/docker/mariadb/mariadb.json
@@ -1,23 +1,29 @@
 {
-  "id": "mariadb",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "mariadb-1",
-      "containers": [{
-        "name": "mariadb",
-        "image": "kollaglue/fedora-rdo-mariadb",
-        "env": [{
-	  'name': 'DB_ROOT_PASSWORD',
-	  'value': 'password'
-	}],
-        "ports": [{
-          "containerPort": 3306
-        }]
-      }]
+    "id": "mariadb",
+    "desiredState": {
+        "manifest": {
+            "version": "v1beta1",
+            "id": "mariadb-1",
+            "containers": [
+                {
+                    "name": "mariadb",
+                    "image": "kollaglue/fedora-rdo-mariadb",
+                    "env": [
+                        {
+                            "name": "DB_ROOT_PASSWORD",
+                            "value": "password"
+                        }
+                    ],
+                    "ports": [
+                        {
+                            "containerPort": 3306
+                        }
+                    ]
+                }
+            ]
+        }
+    },
+    "labels": {
+        "name": "mariadb-master"
     }
-  },
-  "labels": {
-    "name": "mariadb-master"
-  }
 }
diff --git a/docker/rabbitmq/rabbitmq.json b/docker/rabbitmq/rabbitmq.json
index c9b548288..24d7511ce 100644
--- a/docker/rabbitmq/rabbitmq.json
+++ b/docker/rabbitmq/rabbitmq.json
@@ -9,7 +9,7 @@
         "image": "docker.usersys.redhat.com/larsks/rabbitmq",
         "ports": [
           {"containerPort": 5672}
-        ],
+        ]
       }]
     }
   },
diff --git a/docker/swift/swift.json b/docker/swift/swift.json
index 763f8e9c3..0e21cdf71 100644
--- a/docker/swift/swift.json
+++ b/docker/swift/swift.json
@@ -1,98 +1,106 @@
 {
-  "id": "swift",
-  "desiredState": {
-    "manifest": {
-      "version": "v1beta1",
-      "id": "swift-1",
-      "containers": [
-        {
-          "name": "swift-account-server",
-          "image": "fedora-rdo-swift-account-server",
-          "ports": [
-            {"containerPort": 9292}
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "SWIFT_DB_PASSWORD",
-              "value": "swiftdbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        },
-        {
-          "name": "swift-container-server",
-          "image": "fedora-rdo-swift-container-server",
-          "ports": [
-            {"containerPort": 9292},
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "SWIFT_DB_PASSWORD",
-              "value": "swiftdbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        },
-        {
-          "name": "swift-object-server",
-          "image": "fedora-rdo-swift-object-server",
-          "ports": [
-            {"containerPort": 9292},
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "SWIFT_DB_PASSWORD",
-              "value": "swiftdbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
-        },
-        {
-          "name": "swift-proxy-server",
-          "image": "fedora-rdo-swift-proxy-server",
-          "ports": [
-            {"containerPort": 9292},
-          ],
-          "env": [
-            {
-              "name": "DB_ROOT_PASSWORD",
-              "value": "password"
-            },
-            {
-              "name": "SWIFT_DB_PASSWORD",
-              "value": "swiftdbpassword"
-            },
-            {
-              "name": "KEYSTONE_ADMIN_TOKEN",
-              "value": "ADMINTOKEN"
-            }
-          ]
+    "id": "swift",
+    "desiredState": {
+        "manifest": {
+            "version": "v1beta1",
+            "id": "swift-1",
+            "containers": [
+                {
+                    "name": "swift-account-server",
+                    "image": "fedora-rdo-swift-account-server",
+                    "ports": [
+                        {
+                            "containerPort": 9292
+                        }
+                    ],
+                    "env": [
+                        {
+                            "name": "DB_ROOT_PASSWORD",
+                            "value": "password"
+                        },
+                        {
+                            "name": "SWIFT_DB_PASSWORD",
+                            "value": "swiftdbpassword"
+                        },
+                        {
+                            "name": "KEYSTONE_ADMIN_TOKEN",
+                            "value": "ADMINTOKEN"
+                        }
+                    ]
+                },
+                {
+                    "name": "swift-container-server",
+                    "image": "fedora-rdo-swift-container-server",
+                    "ports": [
+                        {
+                            "containerPort": 9292
+                        }
+                    ],
+                    "env": [
+                        {
+                            "name": "DB_ROOT_PASSWORD",
+                            "value": "password"
+                        },
+                        {
+                            "name": "SWIFT_DB_PASSWORD",
+                            "value": "swiftdbpassword"
+                        },
+                        {
+                            "name": "KEYSTONE_ADMIN_TOKEN",
+                            "value": "ADMINTOKEN"
+                        }
+                    ]
+                },
+                {
+                    "name": "swift-object-server",
+                    "image": "fedora-rdo-swift-object-server",
+                    "ports": [
+                        {
+                            "containerPort": 9292
+                        }
+                    ],
+                    "env": [
+                        {
+                            "name": "DB_ROOT_PASSWORD",
+                            "value": "password"
+                        },
+                        {
+                            "name": "SWIFT_DB_PASSWORD",
+                            "value": "swiftdbpassword"
+                        },
+                        {
+                            "name": "KEYSTONE_ADMIN_TOKEN",
+                            "value": "ADMINTOKEN"
+                        }
+                    ]
+                },
+                {
+                    "name": "swift-proxy-server",
+                    "image": "fedora-rdo-swift-proxy-server",
+                    "ports": [
+                        {
+                            "containerPort": 9292
+                        }
+                    ],
+                    "env": [
+                        {
+                            "name": "DB_ROOT_PASSWORD",
+                            "value": "password"
+                        },
+                        {
+                            "name": "SWIFT_DB_PASSWORD",
+                            "value": "swiftdbpassword"
+                        },
+                        {
+                            "name": "KEYSTONE_ADMIN_TOKEN",
+                            "value": "ADMINTOKEN"
+                        }
+                    ]
+                }
+            ]
         }
-      ]
+    },
+    "labels": {
+        "name": "keystone-master"
     }
-  },
-  "labels": {
-    "name": "keystone-master"
-  }
 }