diff options
author | Dan Prince <dprince@redhat.com> | 2017-07-31 17:49:24 -0400 |
---|---|---|
committer | Dan Prince <dprince@redhat.com> | 2017-08-01 10:06:47 -0400 |
commit | 975d862bc32510c0c9a1ae08bb511a43e97762a6 (patch) | |
tree | d808a6857f2c802f978849f81b714716ca866b3b /docker/services | |
parent | 865c65b8f43a909c94b1b50712b5baf088af9566 (diff) |
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
Diffstat (limited to 'docker/services')
-rw-r--r-- | docker/services/cinder-api.yaml | 1 | ||||
-rw-r--r-- | docker/services/heat-api.yaml | 1 | ||||
-rw-r--r-- | docker/services/keystone.yaml | 6 |
3 files changed, 7 insertions, 1 deletions
diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml index 7804fdb2..f4ebdf6d 100644 --- a/docker/services/cinder-api.yaml +++ b/docker/services/cinder-api.yaml @@ -154,6 +154,7 @@ outputs: cinder_api_cron: image: *cinder_api_image net: host + user: root privileged: false restart: always volumes: diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index 0bc331ca..9e38b060 100644 --- a/docker/services/heat-api.yaml +++ b/docker/services/heat-api.yaml @@ -133,6 +133,7 @@ outputs: heat_api_cron: image: {get_param: DockerHeatApiImage} net: host + user: root privileged: false restart: always volumes: 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]} |