Merge "Fix keystone, cinder, heat-api cron containers"

This commit is contained in:
Jenkins 2017-08-03 00:44:41 +00:00 committed by Gerrit Code Review
commit 7aff429265
3 changed files with 7 additions and 1 deletions

View File

@ -160,6 +160,7 @@ outputs:
cinder_api_cron:
image: *cinder_api_image
net: host
user: root
privileged: false
restart: always
volumes:

View File

@ -133,6 +133,7 @@ outputs:
heat_api_cron:
image: {get_param: DockerHeatApiImage}
net: host
user: root
privileged: false
restart: always
volumes:

View File

@ -103,7 +103,9 @@ outputs:
merge: true
preserve_properties: true
/var/lib/kolla/config_files/keystone_cron.json:
command: /usr/sbin/cron -n
# FIXME(dprince): this is unused ATM because Kolla hardcodes the
# args for the keystone container to -DFOREGROUND
command: /usr/sbin/crond -n
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
@ -168,9 +170,11 @@ outputs:
keystone_cron:
start_order: 4
image: *keystone_image
user: root
net: host
privileged: false
restart: always
command: ['/bin/bash', '-c', '/usr/local/bin/kolla_set_configs && /usr/sbin/crond -n']
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}