commit f76fab7238a9c380599c6d4798dff4a7208a05d2
Author: Alex Schultz <aschultz@redhat.com>
Date:   Thu Oct 1 08:14:44 2020 -0600

    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 5d0f624d87abfac88fc4ae437c1728fc415a2b5d)
    (cherry picked from commit 76e3a6880687a06d6d37cb089e35dc5d18aeeaca)

diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml
index 5baef3d..9fe463c 100644
--- a/deployment/nova/nova-libvirt-container-puppet.yaml
+++ b/deployment/nova/nova-libvirt-container-puppet.yaml
@@ -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