openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Make NovaLibvirtOptVolumes role specific 

Since it's common for users to deploy multiple types of compute nodes,
we should make the opt volumes role specific to allow for customization
based on the role being deployed.

Conflicts:
      deployment/nova/nova-libvirt-container-puppet.yaml

Change-Id: Ie9d68fe1a0c3e05c7fc31c3fea79d6019281886b
Related-Bug: #1897265
(cherry picked from commit 5d0f624d87)
(cherry picked from commit 76e3a68806)
This commit is contained in:
Alex Schultz 2020-10-01 08:14:44 -06:00 committed by Rajesh Tailor
parent 01153c9141
commit f76fab7238
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:
@ -334,11 +336,13 @@ resources:
- vhostuser_socket_group: VhostuserSocketGroup
nova::compute::libvirt::qemu::memory_backing_dir: QemuMemoryBackingDir
container_cpuset_cpus: ContainerCpusetCpus
nova_libvirt_opt_volumes: NovaLibvirtOptVolumes
- values: {get_param: [RoleParameters]}
- values:
VhostuserSocketGroup: {get_param: VhostuserSocketGroup}
QemuMemoryBackingDir: {get_param: QemuMemoryBackingDir}
ContainerCpusetCpus: {get_param: ContainerCpusetCpus}
NovaLibvirtOptVolumes: {get_param: NovaLibvirtOptVolumes}
ContainersCommon:
@ -713,7 +717,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