Fix problem with 'storage.zfs_pool_name' being removed from lxd 3
Cherry-pick from master: f1bbc03b65
LXD 3.x onwards removes the key 'storage.zfs_pool_name' from the config.
This means the storage_pool API needs to be used to get the name of the
pool that juju is using for ZFS. This is a temporary fix until storage
pools can be threaded into nova-lxd properly. This occurs on bionic due
to LXD 3 being shipped as standard.
Change-Id: Ic80ad942759718785b62e4fc887ded0a345bb260
Related-Bug: #1782329
This commit is contained in:
Alex Kavanagh
parent
bdf27529a3
commit
84a8c59be6
|
|
@ -74,11 +74,47 @@ r="$r|(?:tempest\.api\.compute\.volumes\.test_attach_volume\.AttachVolumeTestJSO
|
|||
r="$r|(?:tempest\.api\.compute\.volumes\.test_attach_volume\.AttachVolumeShelveTestJSON\.test_attach_detach_volume)"
|
||||
#testtools.matchers._impl.MismatchError: u'NAME MAJ:MIN RM SIZE RO TYPE MOUNTPOINT\nsda 8:0 0 1073741824 0 disk \nsdb 8:16 0 1073741824 0 disk \nvda 253:0 0 85899345920 0 disk \nvdb 253:16 0 42949672960 0 disk ' matches Contains('\nsdb ')
|
||||
|
||||
# XXX: ajkavanagh (2018-07-26): stable/queens ONLY - these tests fails in nova due to tempest changes
|
||||
|
||||
# other failures?
|
||||
|
||||
# tempest.api.compute.admin.test_volumes_negative.VolumesAdminNegativeTest.test_update_attached_volume_with_nonexistent_volume_in_body
|
||||
# tempest.api.compute.admin.test_volumes_negative.VolumesAdminNegativeTest -- tearDown
|
||||
r="$r|(?:tempest\.api\.compute\.admin\.test_volumes_negative\.VolumesAdminNegativeTest\.test_update_attached_volume_with_nonexistent_volume_in_body)"
|
||||
# tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON.test_rebuild_server_with_volume_attached
|
||||
r="$r|(?:tempest\.api\.compute\.servers\.test_server_actions\.ServerActionsTestJSON\.test_rebuild_server_with_volume_attached)"
|
||||
# tempest.api.compute.servers.test_server_rescue_negative.ServerRescueNegativeTestJSON -- tearDown
|
||||
# tempest.api.compute.servers.test_server_rescue_negative.ServerRescueNegativeTestJSON.test_rescued_vm_detach_volume
|
||||
r="$r|(?:tempest\.api\.compute\.servers\.test_server_rescue_negative\.ServerRescueNegativeTestJSON\.test_rescued_vm_detach_volume)"
|
||||
# tempest.api.compute.volumes.test_attach_volume.AttachVolumeTestJSON.test_list_get_volume_attachments
|
||||
r="$r|(?:tempest\.api\.compute\.volumes\.test_attach_volume\.AttachVolumeTestJSON\.test_list_get_volume_attachments)"
|
||||
|
||||
# tempest.api.compute.servers.test_server_actions.ServerActionsTestJSON -- tearDown
|
||||
# tempest.api.compute.volumes.test_attach_volume_negative.AttachVolumeNegativeTest.test_attach_attached_volume_to_different_server
|
||||
# tempest.api.compute.volumes.test_attach_volume_negative.AttachVolumeNegativeTest.test_attach_attached_volume_to_same_server
|
||||
# tempest.api.compute.volumes.test_attach_volume_negative.AttachVolumeNegativeTest.test_delete_attached_volume
|
||||
# tempest.api.compute.volumes.test_attach_volume_negative.AttachVolumeNegativeTest -- tearDown
|
||||
r="$r|(?:tempest\.api\.compute\.volumes\.test_attach_volume_negative\.AttachVolumeNegativeTest.*)"
|
||||
# tempest.api.volume.test_volumes_backup.VolumesBackupsTest.test_backup_create_attached_volume
|
||||
r="$r|(?:tempest\.api\.volume\.test_volumes_backup\.VolumesBackupsTest\.test_backup_create_attached_volume)"
|
||||
# tempest.api.volume.test_volumes_snapshots.VolumesSnapshotTestJSON.test_snapshot_create_delete_with_volume_in_use
|
||||
r="$r|(?:tempest\.api\.volume\.test_volumes_snapshots\.VolumesSnapshotTestJSON\.test_snapshot_create_delete_with_volume_in_use)"
|
||||
# tempest.api.volume.test_volumes_snapshots.VolumesSnapshotTestJSON.test_snapshot_create_offline_delete_online
|
||||
r="$r|(?:tempest\.api\.volume\.test_volumes_snapshots\.VolumesSnapshotTestJSON\.test_snapshot_create_offline_delete_online)"
|
||||
# tempest.api.compute.images.test_images.ImagesTestJSON -- tearDown -- drop tests
|
||||
r="$r|(?:tempest\.api\.compute\.images\.test_images\.ImagesTestJSON.*)"
|
||||
|
||||
|
||||
# XXX: jamespage (26 June 2017): disable diagnostic checks until driver implements them
|
||||
# https://bugs.launchpad.net/nova-lxd/+bug/1700516
|
||||
r="$r|(?:.*test_get_server_diagnostics.*)"
|
||||
#test_get_server_diagnostics
|
||||
|
||||
# XXX: ajkavanagh (2018-07-23): disable test_show_update_rebuild_list_server as nova-lxd doesn't have the
|
||||
# 'supports_trusted_certs' capability, and the test uses it.
|
||||
# BUG: https://bugs.launchpad.net/nova-lxd/+bug/1783080
|
||||
r="$r|(?:.*ServerShowV263Test.test_show_update_rebuild_list_server.*)"
|
||||
|
||||
r="$r).*$"
|
||||
|
||||
export DEVSTACK_GATE_TEMPEST_REGEX="$r"
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
import ddt
|
||||
import mock
|
||||
import uuid
|
||||
|
||||
from nova import context
|
||||
from nova.tests.unit import fake_instance
|
||||
|
|
@ -98,7 +99,7 @@ def _fake_instance():
|
|||
_instance_values = {
|
||||
'display_name': 'fake_display_name',
|
||||
'name': 'fake_name',
|
||||
'uuid': 'fake_uuid',
|
||||
'uuid': uuid.uuid1(),
|
||||
'image_ref': 'fake_image',
|
||||
'vcpus': 1,
|
||||
'memory_mb': 512,
|
||||
|
|
|
|||
|
|
@ -213,7 +213,9 @@ class TestDetachEphemeral(test.NoDBTestCase):
|
|||
lxd_config = {'environment': {'storage': 'zfs'},
|
||||
'config': {'storage.zfs_pool_name': 'zfs'}}
|
||||
|
||||
storage.detach_ephemeral(block_device_info, lxd_config, instance)
|
||||
client = mock.Mock()
|
||||
storage.detach_ephemeral(
|
||||
client, block_device_info, lxd_config, instance)
|
||||
|
||||
block_device_info_get_ephemerals.assert_called_once_with(
|
||||
block_device_info)
|
||||
|
|
@ -239,7 +241,9 @@ class TestDetachEphemeral(test.NoDBTestCase):
|
|||
lxd_config = {'environment': {'storage': 'lvm'},
|
||||
'config': {'storage.lvm_vg_name': 'lxd'}}
|
||||
|
||||
storage.detach_ephemeral(block_device_info, lxd_config, instance)
|
||||
client = mock.Mock()
|
||||
storage.detach_ephemeral(
|
||||
client, block_device_info, lxd_config, instance)
|
||||
|
||||
block_device_info_get_ephemerals.assert_called_once_with(
|
||||
block_device_info)
|
||||
|
|
|
|||
|
|
@ -639,7 +639,10 @@ class LXDDriver(driver.ComputeDriver):
|
|||
self.firewall_driver.unfilter_instance(instance, network_info)
|
||||
|
||||
lxd_config = self.client.host_info
|
||||
storage.detach_ephemeral(block_device_info, lxd_config, instance)
|
||||
storage.detach_ephemeral(self.client,
|
||||
block_device_info,
|
||||
lxd_config,
|
||||
instance)
|
||||
|
||||
name = pwd.getpwuid(os.getuid()).pw_name
|
||||
|
||||
|
|
@ -1017,9 +1020,15 @@ class LXDDriver(driver.ComputeDriver):
|
|||
# to support LXD storage pools
|
||||
storage_driver = lxd_config['environment']['storage']
|
||||
if storage_driver == 'zfs':
|
||||
local_disk_info = _get_zpool_info(
|
||||
lxd_config['config']['storage.zfs_pool_name']
|
||||
)
|
||||
# NOTE(ajkavanagh) - BUG/1782329 - this is temporary until storage
|
||||
# pools is implemented. LXD 3 removed the storage.zfs_pool_name
|
||||
# key from the config. So, if it fails, we need to grab the
|
||||
# configured storage pool and use that as the name instead.
|
||||
try:
|
||||
pool_name = lxd_config['config']['storage.zfs_pool_name']
|
||||
except KeyError:
|
||||
pool_name = CONF.lxd.pool
|
||||
local_disk_info = _get_zpool_info(pool_name)
|
||||
else:
|
||||
local_disk_info = _get_fs_info(CONF.lxd.root_dir)
|
||||
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@
|
|||
# under the License.
|
||||
import os
|
||||
|
||||
from oslo_config import cfg
|
||||
from oslo_utils import fileutils
|
||||
from nova import exception
|
||||
from nova import utils
|
||||
|
|
@ -21,6 +22,8 @@ from nova.virt import driver
|
|||
|
||||
from nova.virt.lxd import common
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
|
||||
def attach_ephemeral(client, block_device_info, lxd_config, instance):
|
||||
"""Attach ephemeral storage to an instance."""
|
||||
|
|
@ -39,7 +42,15 @@ def attach_ephemeral(client, block_device_info, lxd_config, instance):
|
|||
storage_dir = os.path.join(
|
||||
instance_attrs.storage_path, ephemeral['virtual_name'])
|
||||
if storage_driver == 'zfs':
|
||||
zfs_pool = lxd_config['config']['storage.zfs_pool_name']
|
||||
# NOTE(ajkavanagh) - BUG/1782329 - this is temporary until
|
||||
# storage pools is implemented. LXD 3 removed the
|
||||
# storage.zfs_pool_name key from the config. So, if it fails,
|
||||
# we need to grab the configured storage pool and use that as
|
||||
# the name instead.
|
||||
try:
|
||||
zfs_pool = lxd_config['config']['storage.zfs_pool_name']
|
||||
except KeyError:
|
||||
zfs_pool = CONF.lxd.pool
|
||||
|
||||
utils.execute(
|
||||
'zfs', 'create',
|
||||
|
|
@ -92,7 +103,7 @@ def attach_ephemeral(client, block_device_info, lxd_config, instance):
|
|||
storage_dir, run_as_root=True)
|
||||
|
||||
|
||||
def detach_ephemeral(block_device_info, lxd_config, instance):
|
||||
def detach_ephemeral(client, block_device_info, lxd_config, instance):
|
||||
"""Detach ephemeral device from the instance."""
|
||||
ephemeral_storage = driver.block_device_info_get_ephemerals(
|
||||
block_device_info)
|
||||
|
|
@ -101,7 +112,15 @@ def detach_ephemeral(block_device_info, lxd_config, instance):
|
|||
|
||||
for ephemeral in ephemeral_storage:
|
||||
if storage_driver == 'zfs':
|
||||
zfs_pool = lxd_config['config']['storage.zfs_pool_name']
|
||||
# NOTE(ajkavanagh) - BUG/1782329 - this is temporary until
|
||||
# storage pools is implemented. LXD 3 removed the
|
||||
# storage.zfs_pool_name key from the config. So, if it fails,
|
||||
# we need to grab the configured storage pool and use that as
|
||||
# the name instead.
|
||||
try:
|
||||
zfs_pool = lxd_config['config']['storage.zfs_pool_name']
|
||||
except KeyError:
|
||||
zfs_pool = CONF.lxd.pool
|
||||
|
||||
utils.execute(
|
||||
'zfs', 'destroy',
|
||||
|
|
|
|||
Loading…
Reference in New Issue