diff options
| author |   Dan Prince <dprince@redhat.com> | 2017-07-20 19:55:04 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2017-07-20 20:19:10 -0400 |
| commit | c18b56e7902ff6ac685429375ca1deae1dbcb47e (patch) | |
| tree | ac8e2ce5fc394cb9ad32ecd99dd59a4a53432a9e /docker | |
| parent | 782f68c8fd6df1c3ee00fd19d5a8ff9447689d72 (diff) | |
Add keystone cron container to run token_flush
The token-flush cron job is created in /var/spool/cron/keystone
by puppet. This patch creates a cron container to run that
in an environment where it has access to keystone.conf
and the keystone-manage binaries.
Change-Id: Ie305ee9990657c66938250d1d6e19fef94675997
Partial-bug: 1701254
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/services/keystone.yaml | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index da04682e..7ecfc329 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -98,6 +98,17 @@ outputs: dest: "/" merge: true preserve_properties: true + /var/lib/kolla/config_files/keystone_cron.json: + command: /usr/sbin/cron -n + config_files: + - source: "/var/lib/kolla/config_files/src/*" + dest: "/" + merge: true + preserve_properties: true + permissions: + - path: /var/log/keystone + owner: keystone:keystone + recurse: true docker_config: # Kolla_bootstrap/db sync runs before permissions set by kolla_config step_2: @@ -150,6 +161,21 @@ outputs: user: root command: [ 'keystone', '/usr/bin/bootstrap_host_exec', 'keystone' ,'keystone-manage', 'bootstrap', '--bootstrap-password', {get_param: AdminPassword} ] + keystone_cron: + start_order: 4 + image: *keystone_image + net: host + privileged: false + restart: always + volumes: + list_concat: + - {get_attr: [ContainersCommon, volumes]} + - + - /var/lib/kolla/config_files/keystone_cron.json:/var/lib/kolla/config_files/config.json:ro + - /var/lib/config-data/puppet-generated/keystone/:/var/lib/kolla/config_files/src:ro + - /var/log/containers/keystone:/var/log/keystone + environment: + - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS docker_puppet_tasks: # Keystone endpoint creation occurs only on single node step_3: |