openstack/kolla-ansible
Code Issues Proposed changes

Merge "remove "master" from mariadb k8s configs"

Browse Source
This commit is contained in:
Jenkins 2014-10-07 14:54:56 +00:00 committed by Gerrit Code Review
commit 296b09e0c4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/mariadb/mariadb-service.json
View File

@ -1,10 +1,10 @@
{ {
"id": "mariadbmaster", "id": "mariadb",
"kind": "Service", "kind": "Service",
"apiVersion": "v1beta1", "apiVersion": "v1beta1",
"port": 3306, "port": 3306,
"containerPort": 3306, "containerPort": 3306,
"selector": { "selector": {
"name": "mariadb-master" "name": "mariadb"
} }
} }

14
docker/mariadb/mariadb.json
View File

@ -1,29 +1,29 @@
{ {
"id": "mariadb",
"desiredState": { "desiredState": {
"manifest": { "manifest": {
"version": "v1beta1",
"id": "mariadb-1",
"containers": [ "containers": [
{ {
"name": "mariadb",
"image": "kollaglue/fedora-rdo-mariadb",
"env": [ "env": [
{ {
"name": "DB_ROOT_PASSWORD", "name": "DB_ROOT_PASSWORD",
"value": "password" "value": "password"
} }
], ],
"image": "kollaglue/fedora-rdo-mariadb",
"name": "mariadb",
"ports": [ "ports": [
{ {
"containerPort": 3306 "containerPort": 3306
} }
] ]
} }
] ],
"id": "mariadb-1",
"version": "v1beta1"
} }
}, },
"id": "mariadb",
"labels": { "labels": {
"name": "mariadb-master" "name": "mariadb"
} }
} }