ExternalMirrors
/
salt-formula
mirror of https://github.com/salt-formulas/salt-formula-salt
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 7 Wiki Activity
Browse Source

Add possibility to specify multiple disks for salt.control formula 

Example:

parameters:
  salt:
    control:
      size: #RAM 4096,8192,16384,32768,65536
        openstack.control:
          cpu: 8
          ram: 32768
          disk_profile: small_two_disks
          net_profile: default

  virt:
    disk:
      small_two_disks:
        - system:
            size: 50000
            image: http:/path/to/image.qcow2
        - cinder-volume:
            size: 50000

Change-Id: Ie092b77627cb2b1d36ba4b7a2a7d749ad91881c8
pull/59/merge
Dennis Dmitriev 7 years ago
parent
1dc8e78874
commit
a57463cea7
3 changed files with 130 additions and 75 deletions
Split View Show Diff Stats
  1. +4
    -0
      .gitreview
  2. +107
    -75
      _modules/virtng.py
  3. +19
    -0
      tests/pillar/control_virt.sls

+ 4
- 0
.gitreview View File

@@ -0,0 +1,4 @@
[gerrit]
host=gerrit.mcp.mirantis.net
port=29418
project=salt-formulas/salt.git

+ 107
- 75
_modules/virtng.py View File

@@ -375,6 +375,24 @@ def _disk_profile(profile, hypervisor, **kwargs):
format: qcow2
model: virtio

Example profile for KVM/QEMU with two disks, first is created
from specified image, the second is empty:

.. code-block:: yaml

virt:
disk:
two_disks:
- system:
size: 8192
format: qcow2
model: virtio
image: http://path/to/image.qcow2
- lvm:
size: 32768
format: qcow2
model: virtio

The ``format`` and ``model`` parameters are optional, and will
default to whatever is best suitable for the active hypervisor.
'''
@@ -538,96 +556,110 @@ def init(name,
salt 'hypervisor' virt.init vm_name 4 512 salt://path/to/image.raw
salt 'hypervisor' virt.init vm_name 4 512 nic=profile disk=profile
'''

hypervisor = __salt__['config.get']('libvirt:hypervisor', hypervisor)

nicp = _nic_profile(nic, hypervisor, **kwargs)

diskp = None
seedable = False
if image: # with disk template image
# if image was used, assume only one disk, i.e. the
# 'default' disk profile
# TODO: make it possible to use disk profiles and use the
# template image as the system disk
#diskp = _disk_profile('default', hypervisor, **kwargs)
#new diskp TCP cloud
diskp = _disk_profile(disk, hypervisor, **kwargs)
# When using a disk profile extract the sole dict key of the first
# array element as the filename for disk
diskp = _disk_profile(disk, hypervisor, **kwargs)

if image:
# Backward compatibility: if 'image' is specified in the VMs arguments
# instead of a disk arguments. In this case, 'image' will be assigned
# to the first disk for the VM.
disk_name = next(diskp[0].iterkeys())
disk_type = diskp[0][disk_name]['format']
disk_file_name = '{0}.{1}'.format(disk_name, disk_type)
# disk size TCP cloud
disk_size = diskp[0][disk_name]['size']


if hypervisor in ['esxi', 'vmware']:
# TODO: we should be copying the image file onto the ESX host
raise SaltInvocationError('virt.init does not support image '
'template template in conjunction '
'with esxi hypervisor')
elif hypervisor in ['qemu', 'kvm']:
img_dir = __salt__['config.option']('virt.images')
img_dest = os.path.join(
img_dir,
name,
disk_file_name
)
img_dir = os.path.dirname(img_dest)
sfn = __salt__['cp.cache_file'](image, saltenv)
if not os.path.isdir(img_dir):
os.makedirs(img_dir)
try:
salt.utils.files.copyfile(sfn, img_dest)
mask = os.umask(0)
os.umask(mask)
# Apply umask and remove exec bit

# Resizing image TCP cloud
cmd = 'qemu-img resize ' + img_dest + ' ' + str(disk_size) + 'M'
subprocess.call(cmd, shell=True)
mode = (0o0777 ^ mask) & 0o0666
os.chmod(img_dest, mode)

except (IOError, OSError) as e:
raise CommandExecutionError('problem copying image. {0} - {1}'.format(image, e))

seedable = True
else:
log.error('unsupported hypervisor when handling disk image')
if not diskp[0][disk_name].get('image', None):
diskp[0][disk_name]['image'] = image

else:
# no disk template image specified, create disks based on disk profile
diskp = _disk_profile(disk, hypervisor, **kwargs)
if hypervisor in ['qemu', 'kvm']:
# TODO: we should be creating disks in the local filesystem with
# qemu-img
raise SaltInvocationError('virt.init does not support disk '
'profiles in conjunction with '
'qemu/kvm at this time, use image '
'template instead')
else:
# assume libvirt manages disks for us
for disk in diskp:
for disk_name, args in disk.items():
# Create multiple disks, empty or from specified images.
for disk in diskp:
log.debug("Creating disk for VM [ {0} ]: {1}".format(name, disk))

for disk_name, args in disk.items():

if hypervisor in ['esxi', 'vmware']:
if 'image' in args:
# TODO: we should be copying the image file onto the ESX host
raise SaltInvocationError('virt.init does not support image '
'template template in conjunction '
'with esxi hypervisor')
else:
# assume libvirt manages disks for us
xml = _gen_vol_xml(name,
disk_name,
args['size'],
hypervisor)
define_vol_xml_str(xml)

elif hypervisor in ['qemu', 'kvm']:

disk_type = args['format']
disk_file_name = '{0}.{1}'.format(disk_name, disk_type)
# disk size TCP cloud
disk_size = args['size']

img_dir = __salt__['config.option']('virt.images')
img_dest = os.path.join(
img_dir,
name,
disk_file_name
)
img_dir = os.path.dirname(img_dest)
if not os.path.isdir(img_dir):
os.makedirs(img_dir)

if 'image' in args:
# Create disk from specified image
sfn = __salt__['cp.cache_file'](args['image'], saltenv)
try:
salt.utils.files.copyfile(sfn, img_dest)
mask = os.umask(0)
os.umask(mask)
# Apply umask and remove exec bit

# Resizing image TCP cloud
cmd = 'qemu-img resize ' + img_dest + ' ' + str(disk_size) + 'M'
subprocess.call(cmd, shell=True)

mode = (0o0777 ^ mask) & 0o0666
os.chmod(img_dest, mode)

except (IOError, OSError) as e:
raise CommandExecutionError('problem while copying image. {0} - {1}'.format(args['image'], e))

if kwargs.get('seed'):
install = kwargs.get('install', True)
seed_cmd = kwargs.get('seed_cmd', 'seedng.apply')

__salt__[seed_cmd](img_dest,
id_=name,
config=kwargs.get('config'),
install=install)
else:
# Create empty disk
try:
mask = os.umask(0)
os.umask(mask)
# Apply umask and remove exec bit

# Create empty image
cmd = 'qemu-img create -f ' + disk_type + ' ' + img_dest + ' ' + str(disk_size) + 'M'
subprocess.call(cmd, shell=True)

mode = (0o0777 ^ mask) & 0o0666
os.chmod(img_dest, mode)

except (IOError, OSError) as e:
raise CommandExecutionError('problem while creating volume {0} - {1}'.format(img_dest, e))

else:
# Unknown hypervisor
raise SaltInvocationError('Unsupported hypervisor when handling disk image: {0}'
.format(hypervisor))

xml = _gen_xml(name, cpu, mem, diskp, nicp, hypervisor, **kwargs)
define_xml_str(xml)

if kwargs.get('seed') and seedable:
install = kwargs.get('install', True)
seed_cmd = kwargs.get('seed_cmd', 'seedng.apply')

__salt__[seed_cmd](img_dest,
id_=name,
config=kwargs.get('config'),
install=install)
if start:
create(name)


+ 19
- 0
tests/pillar/control_virt.sls View File

@@ -1,3 +1,14 @@
virt:
disk:
three_disks:
- system:
size: 4096
image: ubuntu.qcow
- repository_snapshot:
size: 8192
image: snapshot.qcow
- cinder-volume:
size: 2048
salt:
minion:
enabled: true
@@ -16,6 +27,10 @@ salt:
large:
cpu: 4
ram: 8
medium_three_disks:
cpu: 2
ram: 4
disk_profile: three_disks
cluster:
vpc20_infra:
domain: neco.virt.domain.com
@@ -32,3 +47,7 @@ salt:
provider: node02.domain.com
image: bubuntu.qcomw
size: small
ubuntu3:
provider: node03.domain.com
image: meowbuntu.qcom2
size: medium_three_disks

Write Preview
Loading…
Cancel
Save