openstack/kolla-ansible
Code Issues Proposed changes

Validate JSON

Browse Source 
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
This commit is contained in:
Chmouel Boudjnah 2014-10-07 10:02:04 +02:00
parent 0d544c7130
commit e35b376994
5 changed files with 242 additions and 220 deletions

110
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"
}
}

108
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"
}
}

46
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"
}
}

2
docker/rabbitmq/rabbitmq.json

@ -9,7 +9,7 @@
"image": "docker.usersys.redhat.com/larsks/rabbitmq",
"ports": [
{"containerPort": 5672}
],
]
}]
}
},

196
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"
}
}