merge from latest commit

This commit is contained in:
Alan Meadows 2016-11-25 16:40:51 -08:00
commit 53a5973d0b
3 changed files with 52 additions and 1 deletions

View File

@ -4,12 +4,38 @@ metadata:
name: keystone-db-sync
spec:
template:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"env": [
{
"name": "DEPENDENCY_SERVICE",
"value": "mariadb"
},
{
"name": "DEPENDENCY_JOBS",
"value": "mariadb-seed,keystone-init"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec:
restartPolicy: OnFailure
containers:
- name: keystone-init
image: {{ .Values.images.db_sync }}
imagePullPolicy: Always
command:
- bash
- /tmp/db-sync.sh
env:
- name: INTERFACE_NAME
value: "eth0"

View File

@ -28,7 +28,7 @@ spec:
},
{
"name": "COMMAND",
"value": "echo Done"
"value": "echo done"
}
]
}
@ -39,6 +39,9 @@ spec:
containers:
- name: keystone-api
image: {{ .Values.images.api }}
command:
- bash
- /tmp/start.sh
env:
- name: INTERFACE_NAME
value: "eth0"

View File

@ -4,6 +4,28 @@ metadata:
name: keystone-init
spec:
template:
metadata:
annotations:
pod.beta.kubernetes.io/init-containers: '[
{
"name": "init",
"image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
"env": [
{
"name": "DEPENDENCY_SERVICE",
"value": "mariadb"
},
{
"name": "DEPENDENCY_JOBS",
"value": "mariadb-seed,keystone-init"
},
{
"name": "COMMAND",
"value": "echo done"
}
]
}
]'
spec:
restartPolicy: OnFailure
containers: