openstack/sunbeam-charms
Code Issues Proposed changes

Allow snap to detect virt type

Browse Source 
Don't provide an explicit value to virt-type to the snap, ensuring
that the code in the snap that falls back to userspace emulation
kicks in when KVM is not possible.

Change-Id: If4a21febf4b37d8a09da9448736d8bc84c4d4dda
This commit is contained in:
James Page 2024-01-16 18:22:08 +00:00 committed by Billy Olsen
parent fe37640899
commit 3b89b09c1e
No known key found for this signature in database
GPG Key ID: 6A8CA9BDB5995260
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
charms/openstack-hypervisor/src/charm.py
View File

@ -384,7 +384,6 @@ class HypervisorOperatorCharm(sunbeam_charm.OSBaseOperatorCharm):
"compute.cpu-mode": "host-model", "compute.cpu-mode": "host-model",
"compute.spice-proxy-address": config("ip-address") "compute.spice-proxy-address": config("ip-address")
or local_ip, or local_ip,
"compute.virt-type": "kvm",
"compute.cacert": base64.b64encode( "compute.cacert": base64.b64encode(
contexts.certificates.ca_cert.encode() contexts.certificates.ca_cert.encode()
).decode(), ).decode(),

2
charms/openstack-hypervisor/tests/unit/test_charm.py
View File

@ -130,7 +130,6 @@ class TestCharm(test_utils.CharmTestCase):
expect_settings = { expect_settings = {
"compute.cpu-mode": "host-model", "compute.cpu-mode": "host-model",
"compute.spice-proxy-address": "10.0.0.10", "compute.spice-proxy-address": "10.0.0.10",
"compute.virt-type": "kvm",
"compute.cacert": cacert, "compute.cacert": cacert,
"compute.cert": certificate, "compute.cert": certificate,
"compute.key": private_key, "compute.key": private_key,
@ -223,7 +222,6 @@ class TestCharm(test_utils.CharmTestCase):
expect_settings = { expect_settings = {
"compute.cpu-mode": "host-model", "compute.cpu-mode": "host-model",
"compute.spice-proxy-address": "10.0.0.10", "compute.spice-proxy-address": "10.0.0.10",
"compute.virt-type": "kvm",
"compute.cacert": cacert, "compute.cacert": cacert,
"compute.cert": certificate, "compute.cert": certificate,
"compute.key": private_key, "compute.key": private_key,