Merge "nova_api_cron docker fix: add /var/spool/cron/nova"
This commit is contained in:
commit
36e6a0c693
|
@ -88,6 +88,17 @@ outputs:
|
|||
- path: /var/log/nova
|
||||
owner: nova:nova
|
||||
recurse: true
|
||||
/var/lib/kolla/config_files/nova_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/nova
|
||||
owner: nova:nova
|
||||
recurse: true
|
||||
docker_config:
|
||||
# db sync runs before permissions set by kolla_config
|
||||
step_2:
|
||||
|
@ -151,7 +162,7 @@ outputs:
|
|||
user: nova
|
||||
privileged: true
|
||||
restart: always
|
||||
volumes: &nova_api_volumes
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
|
@ -164,12 +175,17 @@ outputs:
|
|||
image: *nova_api_image
|
||||
net: host
|
||||
user: root
|
||||
privileged: true
|
||||
privileged: false
|
||||
restart: always
|
||||
volumes: *nova_api_volumes
|
||||
volumes:
|
||||
list_concat:
|
||||
- {get_attr: [ContainersCommon, volumes]}
|
||||
-
|
||||
- /var/lib/kolla/config_files/nova_api_cron.json:/var/lib/kolla/config_files/config.json:ro
|
||||
- /var/lib/config-data/puppet-generated/nova/:/var/lib/kolla/config_files/src:ro
|
||||
- /var/log/containers/nova:/var/log/nova
|
||||
environment:
|
||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||
command: "/usr/sbin/crond -n"
|
||||
step_5:
|
||||
nova_api_discover_hosts:
|
||||
start_order: 1
|
||||
|
|
Loading…
Reference in New Issue