openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Refactor usage of QemuMemoryBackingDir 

Currently the QemuMemoryBackingDir parameter is used in two templates
for modular libvirt daemon. The common template defines container
volumes while the modular-libvirt template defines puppet hieradata.

This change migrate the second usage to the common template so that
we can more easily maintain the parameter in the single place.

Change-Id: I3bcd73f0dc97af4d3160313693cb1af9bccabede
This commit is contained in:
Takashi Kajinami 2021-10-11 23:37:49 +09:00
parent 40d5282eb7
commit 4d6dc5308d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment/nova/nova-libvirt-common.yaml
View File

@ -134,8 +134,13 @@ outputs:
default_user: {get_param: CephClientUserName}
multiconfig: {get_param: CinderRbdMultiConfig}
config_settings:
description: Extra hieradata for all modular virt daemons.
value:
{get_attr: [RoleParametersValue, value]}
volumes:
description: Common volumes for all moduler virt daemons.
description: Common volumes for all modular virt daemons.
value:
list_concat:
- - /lib/modules:/lib/modules:ro

3
deployment/nova/nova-modular-libvirt-container-puppet.yaml
View File

@ -346,12 +346,10 @@ resources:
map_replace:
- 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:
@ -389,6 +387,7 @@ outputs:
- get_attr: [NovaBase, role_data, config_settings]
- get_attr: [RoleParametersValue, value]
- get_attr: [NovaLibvirtLogging, config_settings]
- get_attr: [NovaLibvirtCommon, config_settings]
# we include ::nova::compute::libvirt::services in nova/libvirt profile
- nova::compute::libvirt::manage_libvirt_services: false
tripleo::profile::base::nova::virtlogd_wrapper::enable_wrapper: {get_param: NovaEnableVirtlogdContainerWrapper}