openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Replace deprecated libvirt_* options"

This commit is contained in:
Zuul 2020-09-29 15:05:03 +00:00 committed by Gerrit Code Review
parent ce7f42aad6 b2d7b3e5ef
commit 64be88c48a
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/multinode-containers.yaml
View File

@ -44,7 +44,7 @@ parameter_defaults:
- OS::TripleO::Services::Clustercheck
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu
nova::compute::libvirt::virt_type: qemu
Debug: True
DockerPuppetDebug: True
NotificationDriver: 'noop'

4
ci/environments/octavia-kvm.yaml
View File

@ -3,5 +3,5 @@ parameter_defaults:
# Config related to nova libvirt
octavia::controller::connection_retry_interval: 10
nova::compute::libvirt::services::libvirt_virt_type: kvm
nova::compute::libvirt::libvirt_virt_type: kvm
nova::compute::libvirt::libvirt_cpu_mode: 'host-passthrough'
nova::compute::libvirt::virt_type: kvm
nova::compute::libvirt::cpu_mode: 'host-passthrough'

2
ci/environments/ovb-ha.yaml
View File

@ -1,7 +1,7 @@
parameter_defaults:
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu
nova::compute::libvirt::virt_type: qemu
Debug: true
HideSensitiveLogs: false
DockerPuppetDebug: True

2
ci/environments/scenario001-multinode-containers.yaml
View File

@ -97,7 +97,7 @@ parameter_defaults:
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu
nova::compute::libvirt::virt_type: qemu
# NOTE(sileht): To decrease the time test_telemetry_integration takes We
# configure Ceilometer to poll more, We configure the
# 'ceilometer-high-rate' Gnocchi archive policy to keep 1 point every 60s.

4
ci/environments/scenario007-multinode-containers.yaml
View File

@ -67,9 +67,9 @@ parameter_defaults:
- OS::TripleO::Services::Multipathd
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu
nova::compute::libvirt::virt_type: qemu
# Required for Centos 7.3 and Qemu 2.6.0
nova::compute::libvirt::libvirt_cpu_mode: 'none'
nova::compute::libvirt::cpu_mode: 'none'
# For ML2/OVS
NeutronMechanismDrivers: 'openvswitch'
NeutronPluginExtensions: "qos,port_security"

2
ci/environments/scenario010-multinode-containers.yaml
View File

@ -74,7 +74,7 @@ parameter_defaults:
- OS::TripleO::Services::Multipathd
ControllerExtraConfig:
nova::compute::libvirt::services::libvirt_virt_type: qemu
nova::compute::libvirt::libvirt_virt_type: qemu
nova::compute::libvirt::virt_type: qemu
octavia::controller::connection_retry_interval: 10
Debug: true
CephAnsibleDisksConfig:

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

@ -524,7 +524,7 @@ resources:
nova::compute::libvirt::tx_queue_size: NovaLibvirtTxQueueSize
nova::compute::libvirt::file_backed_memory: NovaLibvirtFileBackedMemory
nova::compute::libvirt::volume_use_multipath: NovaLibvirtVolumeUseMultipath
nova::compute::libvirt::libvirt_hw_machine_type: NovaHWMachineType
nova::compute::libvirt::hw_machine_type: NovaHWMachineType
compute_enable_ksm: NovaComputeEnableKsm
nova::compute::rbd::libvirt_images_rbd_pool: NovaRbdPoolName
tripleo::profile::base::nova::compute::nova_nfs_enabled: NovaNfsEnabled

4
deployment/nova/nova-libvirt-container-puppet.yaml
View File

@ -397,8 +397,8 @@ outputs:
tripleo::profile::base::nova::migration::client::ssh_private_key: {get_param: [ MigrationSshKey, private_key ]}
tripleo::profile::base::nova::migration::client::ssh_port: {get_param: MigrationSshPort}
nova::compute::libvirt::services::libvirt_virt_type: {get_param: NovaComputeLibvirtType}
nova::compute::libvirt::libvirt_virt_type: {get_param: NovaComputeLibvirtType}
nova::compute::libvirt::libvirt_enabled_perf_events: {get_param: LibvirtEnabledPerfEvents}
nova::compute::libvirt::virt_type: {get_param: NovaComputeLibvirtType}
nova::compute::libvirt::enabled_perf_events: {get_param: LibvirtEnabledPerfEvents}
nova::compute::libvirt::qemu::configure_qemu: true
nova::compute::libvirt::qemu::max_files: 32768
nova::compute::libvirt::qemu::max_processes: 131072