Merge "Add panko_api_cron container" into stable/stein

This commit is contained in:
Zuul 2019-06-16 05:51:13 +00:00 committed by Gerrit Code Review
commit b8ebdfda4e

View File

@ -246,6 +246,17 @@ outputs:
- path: /var/log/panko
owner: panko:panko
recurse: true
/var/lib/kolla/config_files/panko_api_cron.json:
command: /usr/sbin/crond -n
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
merge: true
preserve_properties: true
permissions:
- path: /var/log/panko
owner: panko:panko
recurse: true
docker_config:
step_2:
get_attr: [PankoApiLogging, docker_config, step_2]
@ -300,6 +311,22 @@ outputs:
- ''
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
panko_api_cron:
image: *panko_api_image
net: host
user: root
privileged: false
restart: always
test: /openstack/healthcheck
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
- {get_attr: [PankoApiLogging, volumes]}
-
- /var/lib/kolla/config_files/panko_api_cron.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/panko/:/var/lib/kolla/config_files/src:ro
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks: {get_attr: [PankoApiLogging, host_prep_tasks]}
metadata_settings:
get_attr: [ApacheServiceBase, role_data, metadata_settings]
@ -310,3 +337,4 @@ outputs:
vars:
containers_to_rm:
- panko_api
- panko_api_cron