From cb24c0bff679035f3ea7e0f1e0c9694e209fc166 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 9 Dec 2021 15:35:49 +0000 Subject: [PATCH] Revert "Fix the wrong parameter name to disable management of libvirt services" This reverts commit 20368af8447250a4c7d5400ca0ec61316751e398. Reason for revert: It turned out the previous parameter name was correct and this change updated it to the wrong name in fact. Change-Id: I0de403cfc2e5b5cd8ad83f568216cbfe7fba01d8 --- 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 c199d49304..b4bd3b26d1 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_service: false + - nova::compute::libvirt::manage_libvirt_services: 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 69b82d4f81..c72dd86de0 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_service: false + - nova::compute::libvirt::manage_libvirt_services: 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 9f71c438b7..7cb58ed9aa 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_service: false + - nova::compute::libvirt::manage_libvirt_services: 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'