Merge "Add new role parameters for cpu/ram/disk allocation ratio" into stable/stein

This commit is contained in:
Zuul 2021-01-06 04:48:20 +00:00 committed by Gerrit Code Review
commit 515a3746d6
3 changed files with 38 additions and 2 deletions

View File

@ -360,7 +360,6 @@ outputs:
nova::cron::purge_shadow_tables::verbose: {get_param: NovaCronPurgeShadowTablesVerbose} nova::cron::purge_shadow_tables::verbose: {get_param: NovaCronPurgeShadowTablesVerbose}
nova::cron::purge_shadow_tables::all_cells: {get_param: NovaCronPurgeShadowTablesAllCells} nova::cron::purge_shadow_tables::all_cells: {get_param: NovaCronPurgeShadowTablesAllCells}
nova::compute::sync_power_state_interval: {get_param: NovaSyncPowerStateInterval} nova::compute::sync_power_state_interval: {get_param: NovaSyncPowerStateInterval}
nova::ram_allocation_ratio: '1.0'
nova_is_additional_cell: {get_param: NovaAdditionalCell} nova_is_additional_cell: {get_param: NovaAdditionalCell}
- get_attr: [RoleParametersValue, value] - get_attr: [RoleParametersValue, value]
- -

View File

@ -336,6 +336,24 @@ parameters:
description: Whether to wait for `network-vif-plugged` events before starting guest transfer. description: Whether to wait for `network-vif-plugged` events before starting guest transfer.
default: true default: true
type: boolean type: boolean
NovaCPUAllocationRatio:
type: number
description: Virtual CPU to physical CPU allocation ratio.
default: 0.0
tags:
- role_specific
NovaRAMAllocationRatio:
type: number
description: Virtual RAM to physical RAM allocation ratio.
default: 1.0
tags:
- role_specific
NovaDiskAllocationRatio:
type: number
description: Virtual disk to physical disk allocation ratio.
default: 0.0
tags:
- role_specific
resources: resources:
@ -403,6 +421,9 @@ resources:
nova::compute::libvirt::mem_stats_period_seconds: NovaLibvirtMemStatsPeriodSeconds nova::compute::libvirt::mem_stats_period_seconds: NovaLibvirtMemStatsPeriodSeconds
resume_guests_state_on_host_boot: NovaResumeGuestsStateOnHostBoot resume_guests_state_on_host_boot: NovaResumeGuestsStateOnHostBoot
nova::compute::rbd::ephemeral_storage: NovaEnableRbdBackend nova::compute::rbd::ephemeral_storage: NovaEnableRbdBackend
nova::cpu_allocation_ratio: NovaCPUAllocationRatio
nova::ram_allocation_ratio: NovaRAMAllocationRatio
nova::disk_allocation_ratio: NovaDiskAllocationRatio
- values: {get_param: [RoleParameters]} - values: {get_param: [RoleParameters]}
- values: - values:
NovaVcpuPinSet: {get_param: NovaVcpuPinSet} NovaVcpuPinSet: {get_param: NovaVcpuPinSet}
@ -470,6 +491,9 @@ resources:
NovaLibvirtNumPciePorts: {get_param: NovaLibvirtNumPciePorts} NovaLibvirtNumPciePorts: {get_param: NovaLibvirtNumPciePorts}
NovaLibvirtMemStatsPeriodSeconds: {get_param: NovaLibvirtMemStatsPeriodSeconds} NovaLibvirtMemStatsPeriodSeconds: {get_param: NovaLibvirtMemStatsPeriodSeconds}
NovaEnableRbdBackend: {get_param: NovaEnableRbdBackend} NovaEnableRbdBackend: {get_param: NovaEnableRbdBackend}
NovaCPUAllocationRatio: {get_param: NovaCPUAllocationRatio}
NovaRAMAllocationRatio: {get_param: NovaRAMAllocationRatio}
NovaDiskAllocationRatio: {get_param: NovaDiskAllocationRatio}
conditions: conditions:
enable_instance_ha: {equals: [{get_param: EnableInstanceHA}, true]} enable_instance_ha: {equals: [{get_param: EnableInstanceHA}, true]}
@ -601,7 +625,7 @@ outputs:
if: if:
- libvirt_file_backed_memory_enabled - libvirt_file_backed_memory_enabled
- '1.0' - '1.0'
- null - {get_attr: [RoleParametersValue, value, 'nova::ram_allocation_ratio']}
service_config_settings: service_config_settings:
fluentd: fluentd:
tripleo_fluentd_groups_nova_compute: tripleo_fluentd_groups_nova_compute:

View File

@ -0,0 +1,13 @@
---
features:
- |
Add new role parameters `NovaCPUAllocationRatio`, `NovaRAMAllocationRatio`
and `NovaDiskAllocationRatio` which allows to configure `cpu_allocation_ratio`,
`ram_allocation_ratio` and `disk_allocation_ratio`.
Default value for NovaCPUAllocationRatio is 0.0
Default value for NovaRAMAllocationRatio is 1.0
Default value for NovaDiskAllocationRatio is 0.0
The default values for CPU and Disk allocation ratio
are taken 0.0 as mentioned in [1].
[1] https://specs.openstack.org/openstack/nova-specs/specs/stein/implemented/initial-allocation-ratios.html