From 975d862bc32510c0c9a1ae08bb511a43e97762a6 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Mon, 31 Jul 2017 17:49:24 -0400 Subject: Fix keystone, cinder, heat-api cron containers The cron containers need to run as root in order to create PID files correctly. Additionally, the keystone_cron container was misconfigured to use /usr/bin/cron instead of the correct /usr/bin/crond. Additionally we have an issue where the Kolla keystone container has hard coded ARGS for the docker container which causes -DFOREGROUND (an Apache specific argument) to get appended onto the kolla_start command thus causing crond to fail to startup correctly. This works around the issue by overriding the command and calling kolla_set_configs manually. Once we fix this in Kolla we can revisit this. Change-Id: Ib8fb2bef9a3bb89131265051e9ea304525b58374 Related-bug: 1707785 --- docker/services/keystone.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'docker/services/keystone.yaml') diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index 7ecfc329..88603383 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -99,7 +99,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: "/" @@ -164,9 +166,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]} -- cgit 1.2.3-korg