diff options
| author | Michael Still <mikal@stillhq.com> | 2018-03-12 19:40:40 +1100 |
|---|---|---|
| committer | Michael Still <mikal@stillhq.com> | 2018-04-04 06:29:32 +1000 |
| commit | 0751ee19d88193d2b4579a0ee79a9c9c9c8f52cf (patch) | |
| tree | b3c2cd9bf79db7708f12959a7c28d509946b5e10 /nova/virt/libvirt/utils.py | |
| parent | 144d621397c6a4065dec9773dc7441d9badc8f03 (diff) | |
| download | nova-0751ee19d88193d2b4579a0ee79a9c9c9c8f52cf.tar.gz | |
Move configurable mkfs to privsep.
Nova allows deployers to configure the command line which is used to create
a filesystem of a given type. This is frankly a little bit weird, but its
also historical. Move this functionality to privsep, including doing a
dance at startup to load config flags into privsep in a hopefully secure
manner.
Honestly, all of this code should be deprecated, but that's above my pay
grade and would take time to do. Oh, and maybe deployers love it the way
it is.
Change-Id: Id8eeb21e10f98a448946f178c8c5a36e48c7cac6
blueprint: hurrah-for-privsep
Diffstat (limited to 'nova/virt/libvirt/utils.py')
| -rw-r--r-- | nova/virt/libvirt/utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py index a3fde1a7bf..7915ab520c 100644 --- a/nova/virt/libvirt/utils.py +++ b/nova/virt/libvirt/utils.py @@ -29,10 +29,10 @@ from oslo_utils import fileutils import nova.conf from nova.i18n import _ from nova.objects import fields as obj_fields +import nova.privsep.fs import nova.privsep.idmapshift import nova.privsep.libvirt from nova import utils -from nova.virt.disk import api as disk from nova.virt import images from nova.virt.libvirt import config as vconfig from nova.virt.libvirt.volume import remotefs @@ -105,7 +105,7 @@ def create_ploop_image(disk_format, path, size, fs_type): """ if not fs_type: fs_type = CONF.default_ephemeral_format or \ - disk.FS_FORMAT_EXT4 + nova.privsep.fs.FS_FORMAT_EXT4 fileutils.ensure_tree(path) disk_path = os.path.join(path, 'root.hds') nova.privsep.libvirt.ploop_init(size, disk_format, fs_type, disk_path) |