diff options
| author |   Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-09-10 11:20:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-10 11:20:48 +0000 |
| commit | c92ee8677af0dba1b9f28bc9a97cbf141d60e219 (patch) | |
| tree | 4096e7478b77547ab8b1586c44fb852ac14d111b /fuel/deploy/dha_adapters/libvirt_adapter.py | |
| parent | 55846e9216601a5e3eeb0b16d0ede70fb684c03a (diff) | |
| parent | a98bf1747db2894394da929d07bde78a1ec19015 (diff) | |
Merge "Autodeployer support for ODL Plugin installation + Fuel 6.1"
Diffstat (limited to 'fuel/deploy/dha_adapters/libvirt_adapter.py')
| -rw-r--r-- | fuel/deploy/dha_adapters/libvirt_adapter.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/fuel/deploy/dha_adapters/libvirt_adapter.py b/fuel/deploy/dha_adapters/libvirt_adapter.py index 1eca548..b285c16 100644 --- a/fuel/deploy/dha_adapters/libvirt_adapter.py +++ b/fuel/deploy/dha_adapters/libvirt_adapter.py @@ -1,3 +1,13 @@ +############################################################################### +# Copyright (c) 2015 Ericsson AB and others. +# szilard.cserey@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################### + + import common from lxml import etree from hardware_adapter import HardwareAdapter @@ -10,6 +20,7 @@ DEV = {'pxe': 'network', 'disk': 'hd', 'iso': 'cdrom'} + class LibvirtAdapter(HardwareAdapter): def __init__(self, yaml_path): @@ -88,7 +99,8 @@ class LibvirtAdapter(HardwareAdapter): def node_eject_iso(self, node_id): vm_name = self.get_node_property(node_id, 'libvirtName') device = self.get_name_of_device(vm_name, 'cdrom') - exec_cmd('virsh change-media %s --eject %s' % (vm_name, device), False) + exec_cmd('virsh change-media %s --eject %s --config --live' + % (vm_name, device), False) def node_insert_iso(self, node_id, iso_file): vm_name = self.get_node_property(node_id, 'libvirtName') @@ -119,3 +131,6 @@ class LibvirtAdapter(HardwareAdapter): device = target.get('dev') if device: return device + + def get_virt_net_conf_dir(self): + return self.dha_struct['virtNetConfDir'] |