From 20368af8447250a4c7d5400ca0ec61316751e398 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 8 Dec 2021 19:55:15 +0900 Subject: [PATCH] Fix the wrong parameter name to disable management of libvirt services The parameter name is not manage_libvirt_service's' but manage_libvirt_service. This parameter actually has no effect in TripleO because the service resource and the exect resource are both disabled but would help us reduce unnecessary resources. Change-Id: I05128eb7ba04194247993e32a16280a135f4d18b --- deployment/deprecated/nova/nova-libvirt-container-puppet.yaml | 2 +- deployment/nova/nova-compute-container-puppet.yaml | 2 +- deployment/nova/nova-modular-libvirt-container-puppet.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/deprecated/nova/nova-libvirt-container-puppet.yaml b/deployment/deprecated/nova/nova-libvirt-container-puppet.yaml index b4bd3b26d1..c199d49304 100644 --- a/deployment/deprecated/nova/nova-libvirt-container-puppet.yaml +++ b/deployment/deprecated/nova/nova-libvirt-container-puppet.yaml @@ -363,7 +363,7 @@ outputs: - get_attr: [RoleParametersValue, value] - get_attr: [NovaLibvirtLogging, config_settings] # we include ::nova::compute::libvirt::services in nova/libvirt profile - - nova::compute::libvirt::manage_libvirt_services: false + - nova::compute::libvirt::manage_libvirt_service: false tripleo::profile::base::nova::virtlogd_wrapper::enable_wrapper: {get_param: NovaEnableVirtlogdContainerWrapper} # don't think this is a good place as /var/lib/nova can also be shared storage tripleo::profile::base::nova::virtlogd_wrapper::virtlogd_process_wrapper: '/var/lib/container-config-scripts/virtlogd_wrapper' diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index c72dd86de0..69b82d4f81 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -1073,7 +1073,7 @@ outputs: - get_attr: [NovaLogging, config_settings] - get_attr: [NovaBase, role_data, config_settings] - get_attr: [RoleParametersValue, value] - - nova::compute::libvirt::manage_libvirt_services: false + - nova::compute::libvirt::manage_libvirt_service: false nova::compute::pci::passthrough: str_replace: template: "JSON_PARAM" diff --git a/deployment/nova/nova-modular-libvirt-container-puppet.yaml b/deployment/nova/nova-modular-libvirt-container-puppet.yaml index 7cb58ed9aa..9f71c438b7 100644 --- a/deployment/nova/nova-modular-libvirt-container-puppet.yaml +++ b/deployment/nova/nova-modular-libvirt-container-puppet.yaml @@ -389,7 +389,7 @@ outputs: - 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 + - nova::compute::libvirt::manage_libvirt_service: false tripleo::profile::base::nova::virtlogd_wrapper::enable_wrapper: {get_param: NovaEnableVirtlogdContainerWrapper} # don't think this is a good place as /var/lib/nova can also be shared storage tripleo::profile::base::nova::virtlogd_wrapper::virtlogd_process_wrapper: '/var/lib/container-config-scripts/virtlogd_wrapper'