mirror of
https://github.com/valitydev/salt.git
synced 2024-11-06 16:45:27 +00:00
Finish removing the use of libvirt:hypervisor
Storing the hypervisor type in a configuration value doesn't make sense since the libvirt host tells us what it is capable of. Instead use the values from the guest domains provided by the virt.capabilities. This is also the occasion to remove the use of the 'esxi' hypervisor in as many places as possible since this is a synonym of 'vmware' and 'vmware' is the value provided by the libvirt esx driver.
This commit is contained in:
Cédric Bosdonnat
parent
6659e7beae
commit
34d1b34fed
@ -57,7 +57,6 @@ whatever the ``virt:connection`` is.
|
||||
|
||||
The calls not using the libvirt connection setup are:
|
||||
|
||||
- ``get_profiles``
|
||||
- ``seed_non_shared_migrate``
|
||||
- ``virt_type``
|
||||
- ``is_*hyper``
|
||||
@ -131,8 +130,6 @@ VIRT_STATE_NAME_MAP = {0: 'running',
|
||||
5: 'shutdown',
|
||||
6: 'crashed'}
|
||||
|
||||
VIRT_DEFAULT_HYPER = 'kvm'
|
||||
|
||||
|
||||
def __virtual__():
|
||||
if not HAS_LIBVIRT:
|
||||
@ -248,6 +245,14 @@ def __get_conn(**kwargs):
|
||||
return conn
|
||||
|
||||
|
||||
def _get_domain_types(**kwargs):
|
||||
'''
|
||||
Return the list of possible values for the <domain> type attribute.
|
||||
'''
|
||||
caps = capabilities(**kwargs)
|
||||
return sorted(set([x for y in [guest['arch']['domains'].keys() for guest in caps['guests']] for x in y]))
|
||||
|
||||
|
||||
def _get_domain(conn, *vms, **kwargs):
|
||||
'''
|
||||
Return a domain object for the named VM or return domain object for all VMs.
|
||||
@ -566,7 +571,6 @@ def _gen_xml(name,
|
||||
'''
|
||||
Generate the XML string to define a libvirt VM
|
||||
'''
|
||||
hypervisor = 'vmware' if hypervisor == 'esxi' else hypervisor
|
||||
mem = int(mem) * 1024 # MB
|
||||
context = {
|
||||
'hypervisor': hypervisor,
|
||||
@ -576,7 +580,7 @@ def _gen_xml(name,
|
||||
}
|
||||
if hypervisor in ['qemu', 'kvm']:
|
||||
context['controller_model'] = False
|
||||
elif hypervisor in ['esxi', 'vmware']:
|
||||
elif hypervisor == 'vmware':
|
||||
# TODO: make bus and model parameterized, this works for 64-bit Linux
|
||||
context['controller_model'] = 'lsilogic'
|
||||
|
||||
@ -871,7 +875,7 @@ def _disk_profile(profile, hypervisor, **kwargs):
|
||||
'''
|
||||
default = [{'system':
|
||||
{'size': '8192'}}]
|
||||
if hypervisor in ['esxi', 'vmware']:
|
||||
if hypervisor == 'vmware':
|
||||
overlay = {'format': 'vmdk',
|
||||
'model': 'scsi',
|
||||
'pool': '[{0}] '.format(kwargs.get('pool', '0'))}
|
||||
@ -903,7 +907,6 @@ def _nic_profile(profile_name, hypervisor, **kwargs):
|
||||
overlays = {
|
||||
'kvm': kvm_overlay,
|
||||
'qemu': kvm_overlay,
|
||||
'esxi': vmware_overlay,
|
||||
'vmware': vmware_overlay,
|
||||
}
|
||||
|
||||
@ -1033,7 +1036,7 @@ def init(name,
|
||||
mem,
|
||||
image=None,
|
||||
nic='default',
|
||||
hypervisor=VIRT_DEFAULT_HYPER,
|
||||
hypervisor=None,
|
||||
start=True, # pylint: disable=redefined-outer-name
|
||||
disk='default',
|
||||
saltenv='base',
|
||||
@ -1106,7 +1109,24 @@ def init(name,
|
||||
virt:
|
||||
images: /data/my/vm/images/
|
||||
'''
|
||||
hypervisors = _get_domain_types(**kwargs)
|
||||
hypervisor = __salt__['config.get']('libvirt:hypervisor', hypervisor)
|
||||
if hypervisor is not None:
|
||||
salt.utils.versions.warn_until(
|
||||
'Sodium',
|
||||
'\'libvirt:hypervisor\' configuration property has been deprecated. '
|
||||
'Rather use the \'virt:connection:uri\' to properly define the libvirt '
|
||||
'URI or alias of the host to connect to. \'libvirt:hypervisor\' will '
|
||||
'stop being used in {version}.'
|
||||
)
|
||||
else:
|
||||
# Use the machine types as possible values
|
||||
# Prefer 'kvm' over the others if available
|
||||
hypervisor = 'kvm' if 'kvm' in hypervisors else hypervisors[0]
|
||||
|
||||
# esxi used to be a possible value for the hypervisor: map it to vmware since it's the same
|
||||
hypervisor = 'vmware' if hypervisor == 'esxi' else hypervisor
|
||||
|
||||
log.debug('Using hyperisor %s', hypervisor)
|
||||
|
||||
nicp = _nic_profile(nic, hypervisor, **kwargs)
|
||||
@ -1128,7 +1148,7 @@ def init(name,
|
||||
|
||||
for disk_name, args in six.iteritems(_disk):
|
||||
|
||||
if hypervisor in ['esxi', 'vmware']:
|
||||
if hypervisor == 'vmware':
|
||||
if 'image' in args:
|
||||
# TODO: we should be copying the image file onto the ESX host
|
||||
raise SaltInvocationError(
|
||||
@ -1780,7 +1800,7 @@ def get_xml(vm_, **kwargs):
|
||||
return xml_desc
|
||||
|
||||
|
||||
def get_profiles(hypervisor=None):
|
||||
def get_profiles(hypervisor=None, **kwargs):
|
||||
'''
|
||||
Return the virt profiles for hypervisor.
|
||||
|
||||
@ -1808,10 +1828,24 @@ def get_profiles(hypervisor=None):
|
||||
salt '*' virt.get_profiles hypervisor=esxi
|
||||
'''
|
||||
ret = {}
|
||||
if hypervisor:
|
||||
hypervisor = hypervisor
|
||||
else:
|
||||
hypervisor = __salt__['config.get']('libvirt:hypervisor', VIRT_DEFAULT_HYPER)
|
||||
|
||||
hypervisors = _get_domain_types(**kwargs)
|
||||
default_hypervisor = 'kvm' if 'kvm' in hypervisors else hypervisors[0]
|
||||
|
||||
if not hypervisor:
|
||||
hypervisor = __salt__['config.get']('libvirt:hypervisor')
|
||||
if hypervisor is not None:
|
||||
salt.utils.versions.warn_until(
|
||||
'Sodium',
|
||||
'\'libvirt:hypervisor\' configuration property has been deprecated. '
|
||||
'Rather use the \'virt:connection:uri\' to properly define the libvirt '
|
||||
'URI or alias of the host to connect to. \'libvirt:hypervisor\' will '
|
||||
'stop being used in {version}.'
|
||||
)
|
||||
else:
|
||||
# Use the machine types as possible values
|
||||
# Prefer 'kvm' over the others if available
|
||||
hypervisor = default_hypervisor
|
||||
virtconf = __salt__['config.get']('virt', {})
|
||||
for typ in ['disk', 'nic']:
|
||||
_func = getattr(sys.modules[__name__], '_{0}_profile'.format(typ))
|
||||
|
||||
@ -242,7 +242,7 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin):
|
||||
'''
|
||||
mock = MagicMock(return_value={})
|
||||
with patch.dict(virt.__salt__, {'config.get': mock}): # pylint: disable=no-member
|
||||
ret = virt._disk_profile('nonexistent', 'esxi')
|
||||
ret = virt._disk_profile('nonexistent', 'vmware')
|
||||
self.assertTrue(len(ret) == 1)
|
||||
self.assertIn('system', ret[0])
|
||||
system = ret[0]['system']
|
||||
@ -270,7 +270,7 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin):
|
||||
'''
|
||||
mock = MagicMock(return_value={})
|
||||
with patch.dict(virt.__salt__, {'config.get': mock}): # pylint: disable=no-member
|
||||
ret = virt._nic_profile('nonexistent', 'esxi')
|
||||
ret = virt._nic_profile('nonexistent', 'vmware')
|
||||
self.assertTrue(len(ret) == 1)
|
||||
eth0 = ret[0]
|
||||
self.assertEqual(eth0['name'], 'eth0')
|
||||
@ -347,17 +347,17 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin):
|
||||
|
||||
def test_gen_xml_for_esxi_default_profile(self):
|
||||
'''
|
||||
Test virt._gen_xml(), ESXi default profile case
|
||||
Test virt._gen_xml(), ESXi/vmware default profile case
|
||||
'''
|
||||
diskp = virt._disk_profile('default', 'esxi')
|
||||
nicp = virt._nic_profile('default', 'esxi')
|
||||
diskp = virt._disk_profile('default', 'vmware')
|
||||
nicp = virt._nic_profile('default', 'vmware')
|
||||
xml_data = virt._gen_xml(
|
||||
'hello',
|
||||
1,
|
||||
512,
|
||||
diskp,
|
||||
nicp,
|
||||
'esxi',
|
||||
'vmware',
|
||||
)
|
||||
root = ET.fromstring(xml_data)
|
||||
self.assertEqual(root.attrib['type'], 'vmware')
|
||||
@ -387,7 +387,7 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin):
|
||||
|
||||
def test_gen_xml_for_esxi_custom_profile(self):
|
||||
'''
|
||||
Test virt._gen_xml(), ESXi custom profile case
|
||||
Test virt._gen_xml(), ESXi/vmware custom profile case
|
||||
'''
|
||||
diskp_yaml = '''
|
||||
- first:
|
||||
@ -417,15 +417,15 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin):
|
||||
patch('salt.modules.virt._disk_profile') as disk_profile:
|
||||
disk_profile.return_value = salt.utils.yaml.safe_load(diskp_yaml)
|
||||
nic_profile.return_value = salt.utils.yaml.safe_load(nicp_yaml)
|
||||
diskp = virt._disk_profile('noeffect', 'esxi')
|
||||
nicp = virt._nic_profile('noeffect', 'esxi')
|
||||
diskp = virt._disk_profile('noeffect', 'vmware')
|
||||
nicp = virt._nic_profile('noeffect', 'vmware')
|
||||
xml_data = virt._gen_xml(
|
||||
'hello',
|
||||
1,
|
||||
512,
|
||||
diskp,
|
||||
nicp,
|
||||
'esxi',
|
||||
'vmware',
|
||||
)
|
||||
root = ET.fromstring(xml_data)
|
||||
self.assertEqual(root.attrib['type'], 'vmware')
|
||||
@ -487,17 +487,17 @@ class VirtTestCase(TestCase, LoaderModuleMockMixin):
|
||||
|
||||
def test_controller_for_esxi(self):
|
||||
'''
|
||||
Test virt._gen_xml() generated device controller for ESXi
|
||||
Test virt._gen_xml() generated device controller for ESXi/vmware
|
||||
'''
|
||||
diskp = virt._disk_profile('default', 'esxi')
|
||||
nicp = virt._nic_profile('default', 'esxi')
|
||||
diskp = virt._disk_profile('default', 'vmware')
|
||||
nicp = virt._nic_profile('default', 'vmware')
|
||||
xml_data = virt._gen_xml(
|
||||
'hello',
|
||||
1,
|
||||
512,
|
||||
diskp,
|
||||
nicp,
|
||||
'esxi'
|
||||
'vmware'
|
||||
)
|
||||
root = ET.fromstring(xml_data)
|
||||
controllers = root.findall('.//devices/controller')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user