aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/keystone.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-03 00:44:41 +0000
committerGerrit Code Review <review@openstack.org>2017-08-03 00:44:41 +0000
commit7aff429265f51db3b84143f83bb8428cde28e873 (patch)
treea8d7f9d39d1f6c9f805456186c995806165923cd /docker/services/keystone.yaml
parent303a5be4916ece351e4eaeeb5b4dae44a5e6f490 (diff)
parent975d862bc32510c0c9a1ae08bb511a43e97762a6 (diff)
Merge "Fix keystone, cinder, heat-api cron containers"
Diffstat (limited to 'docker/services/keystone.yaml')
-rw-r--r--docker/services/keystone.yaml6
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index c461f97..fcc458a 100644
--- a/docker/services/keystone.yaml
+++ b/docker/services/keystone.yaml
@@ -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]}