Undercloud specific volumes for mistral-executor container
This fixes the issue where the nova config was being mounted into the mistral-executor, even though that is only needed for the undercloud. The second parameter MistralExecutorExtraVolumes is provided so that users can provide their own extra mounts without overwriting MistralExecutorVolumes. Once this mechanism lands, it can also be used to mount the extra directories which CI needs to modify container images during deployment, therefor this change is part of Blueprint: container-prepare-workflow Change-Id: I88612465d87f24a42e78e5f87a2d6b44b9335b11
This commit is contained in:
parent
f07f33c47a
commit
afba68e50a
@ -40,6 +40,14 @@ parameters:
|
||||
default: false
|
||||
description: Remove package if the service is being disabled during upgrade
|
||||
type: boolean
|
||||
MistralExecutorVolumes:
|
||||
default: []
|
||||
description: List of additional volumes to mount into the mistral-executor container
|
||||
type: comma_delimited_list
|
||||
MistralExecutorExtraVolumes:
|
||||
default: []
|
||||
description: List of user-provided additional volumes to mount into the mistral-executor container
|
||||
type: comma_delimited_list
|
||||
|
||||
|
||||
resources:
|
||||
@ -114,13 +122,11 @@ outputs:
|
||||
- /var/lib/kolla/config_files/mistral_executor.json:/var/lib/kolla/config_files/config.json:ro
|
||||
- /var/lib/config-data/puppet-generated/mistral/:/var/lib/kolla/config_files/src:ro
|
||||
- /run:/run
|
||||
# FIXME: this is required in order for Nova cells
|
||||
# initialization workflows on the Undercloud. Need to
|
||||
# exclude this on the overcloud for security reasons.
|
||||
- /var/run/docker.sock:/var/run/docker.sock:rw
|
||||
- /var/lib/config-data/nova/etc/nova:/etc/nova:ro
|
||||
- /var/log/containers/mistral:/var/log/mistral
|
||||
- /var/lib/mistral:/var/lib/mistral
|
||||
- {get_param: MistralExecutorVolumes}
|
||||
- {get_param: MistralExecutorExtraVolumes}
|
||||
environment:
|
||||
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
|
||||
host_prep_tasks:
|
||||
|
@ -96,6 +96,8 @@ parameter_defaults:
|
||||
ZaqarManagementStore: 'sqlalchemy'
|
||||
MistralCorsAllowedOrigin: '*'
|
||||
MistralExecutionFieldSizeLimit: 16384
|
||||
MistralExecutorVolumes:
|
||||
- /var/lib/config-data/nova/etc/nova:/etc/nova:ro
|
||||
NeutronServicePlugins: router,segments
|
||||
NeutronMechanismDrivers: ['openvswitch', 'baremetal']
|
||||
NeutronNetworkVLANRanges: 'physnet1:1000:2999'
|
||||
|
@ -0,0 +1,7 @@
|
||||
---
|
||||
features:
|
||||
- |
|
||||
The parameter MistralExecutorExtraVolumes can be set to add volume mounts
|
||||
into the undercloud mistral-executor container. This allows workflows to
|
||||
have access to the required files for custom tasks such as rebuilding
|
||||
container images.
|
Loading…
Reference in New Issue
Block a user