openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Make NovaLibvirtOptVolumes role specific" into stable/ussuri

This commit is contained in:
Zuul 2020-10-06 16:35:42 +00:00 committed by Gerrit Code Review
parent 507ccef934 76e3a68806
commit 1f3cdebfc8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/nova/nova-libvirt-container-puppet.yaml
View File

@ -240,6 +240,8 @@ parameters:
default: []
description: list of optional volumes to be mounted
type: comma_delimited_list
tags:
- role_specific
conditions:
@ -333,10 +335,12 @@ resources:
- map_replace:
- vhostuser_socket_group: VhostuserSocketGroup
nova::compute::libvirt::qemu::memory_backing_dir: QemuMemoryBackingDir
nova_libvirt_opt_volumes: NovaLibvirtOptVolumes
- values: {get_param: [RoleParameters]}
- values:
VhostuserSocketGroup: {get_param: VhostuserSocketGroup}
QemuMemoryBackingDir: {get_param: QemuMemoryBackingDir}
NovaLibvirtOptVolumes: {get_param: NovaLibvirtOptVolumes}
ContainersCommon:
@ -712,7 +716,7 @@ outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
- {get_attr: [NovaLibvirtLogging, volumes]}
- {get_param: NovaLibvirtOptVolumes}
- {get_attr: [RoleParametersValue, value, nova_libvirt_opt_volumes]}
-
- /etc/ssh/ssh_known_hosts:/etc/ssh/ssh_known_hosts:ro
- /var/lib/kolla/config_files/nova_libvirt.json:/var/lib/kolla/config_files/config.json:ro