diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-07 14:54:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-07 14:54:56 +0000 |
| commit | 296b09e0c444cc91f3e9f4a1046989d956c1253a (patch) | |
| tree | c56f4d97871eb966536bcee94815b133132d75d7 /docker | |
| parent | 83e451a69c7da7022c465cc407c1e0ec41828180 (diff) | |
| parent | 863e29a78081cb790ae086c37c32dfd9ecf3e13a (diff) | |
| download | kolla-296b09e0c444cc91f3e9f4a1046989d956c1253a.tar.gz kolla-296b09e0c444cc91f3e9f4a1046989d956c1253a.zip | |
Merge "remove "master" from mariadb k8s configs"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/mariadb/mariadb-service.json | 4 | ||||
| -rw-r--r-- | docker/mariadb/mariadb.json | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/docker/mariadb/mariadb-service.json b/docker/mariadb/mariadb-service.json index 652e5d523..d46b058cf 100644 --- a/docker/mariadb/mariadb-service.json +++ b/docker/mariadb/mariadb-service.json @@ -1,10 +1,10 @@ { - "id": "mariadbmaster", + "id": "mariadb", "kind": "Service", "apiVersion": "v1beta1", "port": 3306, "containerPort": 3306, "selector": { - "name": "mariadb-master" + "name": "mariadb" } } diff --git a/docker/mariadb/mariadb.json b/docker/mariadb/mariadb.json index 66e696a0c..a0c58bdaf 100644 --- a/docker/mariadb/mariadb.json +++ b/docker/mariadb/mariadb.json @@ -1,29 +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" } ], + "image": "kollaglue/fedora-rdo-mariadb", + "name": "mariadb", "ports": [ { "containerPort": 3306 } ] } - ] + ], + "id": "mariadb-1", + "version": "v1beta1" } }, + "id": "mariadb", "labels": { - "name": "mariadb-master" + "name": "mariadb" } } |