openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Make NovaLibvirtOptVolumes role specific" into stable/train

This commit is contained in:
Zuul 2020-10-08 17:05:29 +00:00 committed by Gerrit Code Review
parent ea80de375b f76fab7238
commit b28d02caac
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: [] default: []
description: list of optional volumes to be mounted description: list of optional volumes to be mounted
type: comma_delimited_list type: comma_delimited_list
tags:
- role_specific
conditions: conditions:
@ -334,11 +336,13 @@ resources:
- vhostuser_socket_group: VhostuserSocketGroup - vhostuser_socket_group: VhostuserSocketGroup
nova::compute::libvirt::qemu::memory_backing_dir: QemuMemoryBackingDir nova::compute::libvirt::qemu::memory_backing_dir: QemuMemoryBackingDir
container_cpuset_cpus: ContainerCpusetCpus container_cpuset_cpus: ContainerCpusetCpus
nova_libvirt_opt_volumes: NovaLibvirtOptVolumes
- values: {get_param: [RoleParameters]} - values: {get_param: [RoleParameters]}
- values: - values:
VhostuserSocketGroup: {get_param: VhostuserSocketGroup} VhostuserSocketGroup: {get_param: VhostuserSocketGroup}
QemuMemoryBackingDir: {get_param: QemuMemoryBackingDir} QemuMemoryBackingDir: {get_param: QemuMemoryBackingDir}
ContainerCpusetCpus: {get_param: ContainerCpusetCpus} ContainerCpusetCpus: {get_param: ContainerCpusetCpus}
NovaLibvirtOptVolumes: {get_param: NovaLibvirtOptVolumes}
ContainersCommon: ContainersCommon:
@ -713,7 +717,7 @@ outputs:
list_concat: list_concat:
- {get_attr: [ContainersCommon, volumes]} - {get_attr: [ContainersCommon, volumes]}
- {get_attr: [NovaLibvirtLogging, 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 - /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 - /var/lib/kolla/config_files/nova_libvirt.json:/var/lib/kolla/config_files/config.json:ro