openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Cinder containers: volume and env customizations"

Browse Source
This commit is contained in:
Zuul 2018-01-15 21:21:22 +00:00 committed by Gerrit Code Review
commit 5a219d53bf
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker/services/cinder-volume.yaml
View File

@ -52,6 +52,14 @@ parameters:
CephClientUserName: CephClientUserName:
default: openstack default: openstack
type: string type: string
CinderVolumeOptVolumes:
default: []
description: list of optional volumes to be mounted
type: comma_delimited_list
CinderVolumeOptEnvVars:
default: []
description: list of optional environment variables
type: comma_delimited_list
resources: resources:
@ -143,6 +151,7 @@ outputs:
volumes: volumes:
list_concat: list_concat:
- {get_attr: [ContainersCommon, volumes]} - {get_attr: [ContainersCommon, volumes]}
- {get_param: CinderVolumeOptVolumes}
- -
- /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/kolla/config_files/cinder_volume.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
@ -155,7 +164,10 @@ outputs:
- /var/lib/cinder:/var/lib/cinder - /var/lib/cinder:/var/lib/cinder
- /var/log/containers/cinder:/var/log/cinder - /var/log/containers/cinder:/var/log/cinder
environment: environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS list_concat:
- {get_param: CinderVolumeOptEnvVars}
-
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks: host_prep_tasks:
- name: create persistent directories - name: create persistent directories
file: file: