openstack
/
charm-nova-compute
Code Issues Proposed changes

Expose reserved_host_disk_mb for nova.conf 

The config is necessary to calculate available disk space for VMs with
disk-allocation-ratio which is already exposed as a charm option.

Closes-Bug: #1952184
Change-Id: I0ef55987517bded50f855e0dbc5e420cfbff4c1b
This commit is contained in:
Nobuto Murata 2021-11-25 15:44:48 +09:00
parent c8dea9f6da
commit a5dc16393a
13 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.yaml
View File

@ -244,6 +244,11 @@ options:
default: 512
description: |
Amount of memory in MB to reserve for the host. Defaults to 512MB.
reserved-host-disk:
type: int
default: 0
description: |
Amount of disk resource in MB to reserve for the host. Defaults to 0MB.
vcpu-pin-set:
type: string
default:

1
hooks/nova_compute_context.py
View File

@ -302,6 +302,7 @@ class NovaComputeLibvirtContext(context.OSContextGenerator):
ctxt['num_pcie_ports'] = config('num-pcie-ports')
ctxt['reserved_host_memory'] = config('reserved-host-memory')
ctxt['reserved_host_disk'] = config('reserved-host-disk')
db = kv()
if db.get('host_uuid'):

1
templates/kilo/nova.conf
View File

@ -117,6 +117,7 @@ instances_path = {{ instances_path }}
vcpu_pin_set = {{ vcpu_pin_set }}
{% endif -%}
reserved_host_memory_mb = {{ reserved_host_memory }}
reserved_host_disk_mb = {{ reserved_host_disk }}
{% if pci_passthrough_whitelist -%}
pci_passthrough_whitelist = {{ pci_passthrough_whitelist }}

1
templates/liberty/nova.conf
View File

@ -117,6 +117,7 @@ instances_path = {{ instances_path }}
vcpu_pin_set = {{ vcpu_pin_set }}
{% endif -%}
reserved_host_memory_mb = {{ reserved_host_memory }}
reserved_host_disk_mb = {{ reserved_host_disk }}
{% if pci_passthrough_whitelist -%}
pci_passthrough_whitelist = {{ pci_passthrough_whitelist }}

1
templates/mitaka/nova.conf
View File

@ -104,6 +104,7 @@ instances_path = {{ instances_path }}
vcpu_pin_set = {{ vcpu_pin_set }}
{% endif -%}
reserved_host_memory_mb = {{ reserved_host_memory }}
reserved_host_disk_mb = {{ reserved_host_disk }}
{% if pci_passthrough_whitelist -%}
pci_passthrough_whitelist = {{ pci_passthrough_whitelist }}

1
templates/newton/nova.conf
View File

@ -103,6 +103,7 @@ instances_path = {{ instances_path }}
vcpu_pin_set = {{ vcpu_pin_set }}
{% endif -%}
reserved_host_memory_mb = {{ reserved_host_memory }}
reserved_host_disk_mb = {{ reserved_host_disk }}
{% if reserved_huge_pages -%}
{% for value in reserved_huge_pages -%}

1
templates/ocata/nova.conf
View File

@ -106,6 +106,7 @@ instances_path = {{ instances_path }}
vcpu_pin_set = {{ vcpu_pin_set }}
{% endif -%}
reserved_host_memory_mb = {{ reserved_host_memory }}
reserved_host_disk_mb = {{ reserved_host_disk }}
{% if reserved_huge_pages -%}
{% for value in reserved_huge_pages -%}

1
templates/pike/nova.conf
View File

@ -97,6 +97,7 @@ instances_path = {{ instances_path }}
vcpu_pin_set = {{ vcpu_pin_set }}
{% endif -%}
reserved_host_memory_mb = {{ reserved_host_memory }}
reserved_host_disk_mb = {{ reserved_host_disk }}
{% if reserved_huge_pages -%}
{% for value in reserved_huge_pages -%}

1
templates/queens/nova.conf
View File

@ -103,6 +103,7 @@ instances_path = {{ instances_path }}
vcpu_pin_set = {{ vcpu_pin_set }}
{% endif -%}
reserved_host_memory_mb = {{ reserved_host_memory }}
reserved_host_disk_mb = {{ reserved_host_disk }}
{% if reserved_huge_pages -%}
{% for value in reserved_huge_pages -%}

1
templates/rocky/nova.conf
View File

@ -103,6 +103,7 @@ instances_path = {{ instances_path }}
vcpu_pin_set = {{ vcpu_pin_set }}
{% endif -%}
reserved_host_memory_mb = {{ reserved_host_memory }}
reserved_host_disk_mb = {{ reserved_host_disk }}
{% if reserved_huge_pages -%}
{% for value in reserved_huge_pages -%}

1
templates/stein/nova.conf
View File

@ -107,6 +107,7 @@ instances_path = {{ instances_path }}
vcpu_pin_set = {{ vcpu_pin_set }}
{% endif -%}
reserved_host_memory_mb = {{ reserved_host_memory }}
reserved_host_disk_mb = {{ reserved_host_disk }}
{% if reserved_huge_pages -%}
{% for value in reserved_huge_pages -%}

1
templates/train/nova.conf
View File

@ -135,6 +135,7 @@ instances_path = {{ instances_path }}
vcpu_pin_set = {{ vcpu_pin_set }}
{% endif -%}
reserved_host_memory_mb = {{ reserved_host_memory }}
reserved_host_disk_mb = {{ reserved_host_disk }}
{% if reserved_huge_pages -%}
{% for value in reserved_huge_pages -%}

16
unit_tests/test_nova_compute_contexts.py
View File

@ -377,6 +377,7 @@ class NovaComputeContextTests(CharmTestCase):
'inject_password': False,
'inject_partition': -2,
'default_ephemeral_format': 'ext4',
'reserved_host_disk': 0,
'reserved_host_memory': 512}, libvirt())
def test_libvirt_context_inject_password(self):
@ -398,6 +399,7 @@ class NovaComputeContextTests(CharmTestCase):
'inject_password': True,
'inject_partition': -1,
'default_ephemeral_format': 'ext4',
'reserved_host_disk': 0,
'reserved_host_memory': 512}, libvirt())
def test_libvirt_context_libvirtd_reserved_huge_pages_1(self):
@ -419,6 +421,7 @@ class NovaComputeContextTests(CharmTestCase):
'inject_password': False,
'inject_partition': -2,
'default_ephemeral_format': 'ext4',
'reserved_host_disk': 0,
'reserved_host_memory': 512,
'reserved_huge_pages': ['node:0,size:2048,count:6']}, libvirt())
@ -443,6 +446,7 @@ class NovaComputeContextTests(CharmTestCase):
'inject_password': False,
'inject_partition': -2,
'default_ephemeral_format': 'ext4',
'reserved_host_disk': 0,
'reserved_host_memory': 512,
'reserved_huge_pages': ['node:0,size:2048,count:6',
'node:1,size:1G,count:32']}, libvirt())
@ -465,6 +469,7 @@ class NovaComputeContextTests(CharmTestCase):
'inject_password': False,
'inject_partition': -2,
'default_ephemeral_format': 'ext4',
'reserved_host_disk': 0,
'reserved_host_memory': 512}, libvirt())
def test_libvirt_bin_context_migration_tcp_listen(self):
@ -492,6 +497,7 @@ class NovaComputeContextTests(CharmTestCase):
'force_raw_images': True,
'inject_password': False,
'inject_partition': -2,
'reserved_host_disk': 0,
'reserved_host_memory': 512}, libvirt())
def test_libvirt_context_without_migration_network(self):
@ -554,6 +560,7 @@ class NovaComputeContextTests(CharmTestCase):
'inject_password': False,
'inject_partition': -2,
'default_ephemeral_format': 'ext4',
'reserved_host_disk': 0,
'reserved_host_memory': 512}, libvirt())
def test_libvirt_bin_context_migration_tcp_listen_with_post_copy(self):
@ -582,6 +589,7 @@ class NovaComputeContextTests(CharmTestCase):
'force_raw_images': True,
'inject_password': False,
'inject_partition': -2,
'reserved_host_disk': 0,
'reserved_host_memory': 512}, libvirt())
def test_libvirt_disk_cachemodes(self):
@ -603,6 +611,7 @@ class NovaComputeContextTests(CharmTestCase):
'inject_password': False,
'inject_partition': -2,
'default_ephemeral_format': 'ext4',
'reserved_host_disk': 0,
'reserved_host_memory': 512}, libvirt())
def test_libvirt_hugepages(self):
@ -625,6 +634,7 @@ class NovaComputeContextTests(CharmTestCase):
'inject_password': False,
'inject_partition': -2,
'default_ephemeral_format': 'ext4',
'reserved_host_disk': 0,
'reserved_host_memory': 512}, libvirt())
def test_libvirt_context_libvirtd_force_raw_images(self):
@ -646,6 +656,7 @@ class NovaComputeContextTests(CharmTestCase):
'inject_password': False,
'inject_partition': -2,
'default_ephemeral_format': 'ext4',
'reserved_host_disk': 0,
'reserved_host_memory': 512}, libvirt())
def test_lxd_live_migration_opts_xenial(self):
@ -734,6 +745,7 @@ class NovaComputeContextTests(CharmTestCase):
self.lsb_release.return_value = {'DISTRIB_CODENAME': 'lucid'}
self.test_config.set('hugepages', '22')
self.test_config.set('reserved-host-memory', 1024)
self.test_config.set('reserved-host-disk', 65536)
self.test_config.set('vcpu-pin-set', '^0^2')
self.test_config.set('pci-passthrough-whitelist', 'mypcidevices')
self.test_config.set('virtio-net-tx-queue-size', 512)
@ -753,6 +765,7 @@ class NovaComputeContextTests(CharmTestCase):
'listen_tls': 0,
'host_uuid': self.host_uuid,
'reserved_host_memory': 1024,
'reserved_host_disk': 65536,
'force_raw_images': True,
'inject_password': False,
'inject_partition': -2,
@ -778,6 +791,7 @@ class NovaComputeContextTests(CharmTestCase):
'kvm_hugepages': 0,
'listen_tls': 0,
'host_uuid': self.host_uuid,
'reserved_host_disk': 0,
'reserved_host_memory': 512,
'vcpu_pin_set': '^0^2',
'force_raw_images': True,
@ -799,6 +813,7 @@ class NovaComputeContextTests(CharmTestCase):
'kvm_hugepages': 0,
'listen_tls': 0,
'host_uuid': self.host_uuid,
'reserved_host_disk': 0,
'reserved_host_memory': 512,
'cpu_shared_set': '4-15',
'cpu_dedicated_set': '16-31',
@ -1092,6 +1107,7 @@ class SerialConsoleContextTests(CharmTestCase):
'inject_password': False,
'inject_partition': -2,
'default_ephemeral_format': 'ext4',
'reserved_host_disk': 0,
'reserved_host_memory': 512}, libvirt())