Merge "TLS everywhere/docker: add nova services to environment"

[apex-tripleo-heat-templates.git] / docker / services / keystone.yaml

diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml
index c461f97..fcc458a 100644 (file)
--- 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]}