openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Revert "Fix the wrong parameter name to disable management of libvirt services""

Browse Source
This commit is contained in:
Zuul 2021-12-12 20:44:52 +00:00 committed by Gerrit Code Review
commit f84b94bb8c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/deprecated/nova/nova-libvirt-container-puppet.yaml
View File

@ -363,7 +363,7 @@ outputs:
- get_attr: [RoleParametersValue, value] - get_attr: [RoleParametersValue, value]
- get_attr: [NovaLibvirtLogging, config_settings] - get_attr: [NovaLibvirtLogging, config_settings]
# we include ::nova::compute::libvirt::services in nova/libvirt profile # 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} 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 # 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' tripleo::profile::base::nova::virtlogd_wrapper::virtlogd_process_wrapper: '/var/lib/container-config-scripts/virtlogd_wrapper'

2
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -1073,7 +1073,7 @@ outputs:
- get_attr: [NovaLogging, config_settings] - get_attr: [NovaLogging, config_settings]
- get_attr: [NovaBase, role_data, config_settings] - get_attr: [NovaBase, role_data, config_settings]
- get_attr: [RoleParametersValue, value] - get_attr: [RoleParametersValue, value]
- nova::compute::libvirt::manage_libvirt_service: false - nova::compute::libvirt::manage_libvirt_services: false
nova::compute::pci::passthrough: nova::compute::pci::passthrough:
str_replace: str_replace:
template: "JSON_PARAM" template: "JSON_PARAM"

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

@ -389,7 +389,7 @@ outputs:
- get_attr: [NovaLibvirtLogging, config_settings] - get_attr: [NovaLibvirtLogging, config_settings]
- get_attr: [NovaLibvirtCommon, config_settings] - get_attr: [NovaLibvirtCommon, config_settings]
# we include ::nova::compute::libvirt::services in nova/libvirt profile # 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} 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 # 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' tripleo::profile::base::nova::virtlogd_wrapper::virtlogd_process_wrapper: '/var/lib/container-config-scripts/virtlogd_wrapper'