valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

virt module: move virt.images to virt:images

Browse Source 
To continue the virt module options harmonization, deprecate virt.images
in favor of virt:images and add documentation on this option.
This commit is contained in:
Cédric Bosdonnat 2018-04-20 16:10:44 +02:00
parent 20048c6fca
commit 6858c9931a
No known key found for this signature in database
GPG Key ID: 743CCED3EDD1578D
4 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/topics/tutorials/cloud_controller.rst
View File

@ -245,7 +245,7 @@ The Salt Virt runner will now automatically select a hypervisor to deploy
the new virtual machine on. Using ``salt://`` assumes that the CentOS virtual
machine image is located in the root of the :ref:`file-server` on the master.
When images are cloned (i.e. copied locatlly after retrieval from the file server)
the destination directory on the hypervisor minion is determined by the ``virt.images``
the destination directory on the hypervisor minion is determined by the ``virt:images``
config option; by default this is ``/srv/salt/salt-images/``.
When a VM is initialized using ``virt.init`` the image is copied to the hypervisor

4
salt/client/ssh/wrapper/config.py
View File

@ -49,8 +49,8 @@ DEFAULTS = {'mongo.db': 'salt',
'ldap.bindpw': '',
'hosts.file': '/etc/hosts',
'aliases.file': '/etc/aliases',
'virt.images': os.path.join(syspaths.SRV_ROOT_DIR, 'salt-images'),
'virt': {'tunnel': False},
'virt': {'tunnel': False,
'images': os.path.join(syspaths.SRV_ROOT_DIR, 'salt-images')},
}

4
salt/modules/config.py
View File

@ -76,8 +76,8 @@ DEFAULTS = {'mongo.db': 'salt',
'ldap.bindpw': '',
'hosts.file': _HOSTS_FILE,
'aliases.file': '/etc/aliases',
'virt.images': os.path.join(syspaths.SRV_ROOT_DIR, 'salt-images'),
'virt': {'tunnel': False},
'virt': {'tunnel': False,
'images': os.path.join(syspaths.SRV_ROOT_DIR, 'salt-images')},
}

36
salt/modules/virt.py
View File

@ -615,6 +615,26 @@ def _qemu_image_info(path):
return ret
def _get_images_dir():
'''
Extract the images dir from the configuration. First attempts to
find legacy virt.images, then tries virt:images.
'''
img_dir = __salt__['config.option']('virt.images')
if img_dir:
salt.utils.warn_until(
'Sodium',
'\'virt.images\' has been deprecated in favor of '
'\'virt:images\'. \'virt.images\' will stop '
'being used in {version}.')
else:
img_dir = __salt__['config.get']('virt:images')
log.debug('Image directory from config option `virt:images`'
' is %s', img_dir)
return img_dir
def _qemu_image_create(vm_name,
disk_file_name,
disk_image=None,
@ -634,9 +654,8 @@ def _qemu_image_create(vm_name,
.format(disk_file_name)
)
img_dir = __salt__['config.option']('virt.images')
log.debug('Image directory from config option `virt.images`'
' is %s', img_dir)
img_dir = _get_images_dir()
img_dest = os.path.join(
img_dir,
vm_name,
@ -786,7 +805,7 @@ def _disk_profile(profile, hypervisor, **kwargs):
elif hypervisor in ['qemu', 'kvm']:
overlay = {'format': 'qcow2',
'model': 'virtio',
'pool': __salt__['config.option']('virt.images')}
'pool': _get_images_dir()}
else:
overlay = {}
@ -957,6 +976,15 @@ def init(name,
salt 'hypervisor' virt.init vm_name 4 512 salt://path/to/image.raw
salt 'hypervisor' virt.init vm_name 4 512 /var/lib/libvirt/images/img.raw
salt 'hypervisor' virt.init vm_name 4 512 nic=profile disk=profile
The disk images will be created in an image folder within the directory
defined by the ``virt:images`` option. Its default value is
``/srv/salt/salt-images/`` but this can changed with such a configuration:
.. code-block:: yaml
virt:
images: /data/my/vm/images/
'''
hypervisor = __salt__['config.get']('libvirt:hypervisor', hypervisor)
log.debug('Using hyperisor %s', hypervisor)