commit 5d0f624d87abfac88fc4ae437c1728fc415a2b5d Author: Alex Schultz 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. Change-Id: Ie9d68fe1a0c3e05c7fc31c3fea79d6019281886b Related-Bug: #1897265 diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index 3a51ca2..78f3ee9 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: @@ -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