diff options
author | Josep Puigdemont <josep.puigdemont@enea.com> | 2016-05-08 13:04:07 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-08 17:34:50 +0000 |
commit | a31faaebf959dca2793edd984f6776ae5c272f4f (patch) | |
tree | d09bf3d730b109339363c326dc96dfd187b037f9 /patches/opnfv-fuel/0017-virtual_fuel-make-vm_template-an-attibute.patch | |
parent | 1158f729444aa16313e263b468e92555f8eb7eb4 (diff) |
ARMband patches for the fuel@opnfv deploy scripts
These are a collection of patches that adapt the current Fuel deploy
scripts for mainly two purposes:
- Make it possible to create a Fuel VM on a remote libvirt server.
We use the LIBVIRT_DEFAULT_URI environment variable to detect that.
Local deploys are possible by setting this variable to
'quemu:///system', or leaving it empty.
See: https://libvirt.org/remote.html for more details.
- Make it possible to add additional network interfaces. For this we
allow the user to pass the "-b bridge" paramter several times, and
creating a new virtual NIC for each of them, in the same order they
were given.
This required a bit of refactoring of the code.
None of the changes above should break backwards compatibility, except
when indicated in the commit (search for CHANGE in the log)
In addition there are some updates to the code that were deemed
necessary, like the ability to retry when executing shell commands
instead of directly failing, and a simplification of the DHA IPMI
adapter.
Change-Id: I8a0cd5b8672383decd861309328137971eaed14b
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
(cherry picked from commit bedeb36ac9ad42fb1ead2449ed8e75f0171808a2)
Diffstat (limited to 'patches/opnfv-fuel/0017-virtual_fuel-make-vm_template-an-attibute.patch')
-rw-r--r-- | patches/opnfv-fuel/0017-virtual_fuel-make-vm_template-an-attibute.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0017-virtual_fuel-make-vm_template-an-attibute.patch b/patches/opnfv-fuel/0017-virtual_fuel-make-vm_template-an-attibute.patch new file mode 100644 index 00000000..db602029 --- /dev/null +++ b/patches/opnfv-fuel/0017-virtual_fuel-make-vm_template-an-attibute.patch @@ -0,0 +1,33 @@ +From: Josep Puigdemont <josep.puigdemont@enea.com> +Date: Wed, 4 May 2016 14:27:23 +0200 +Subject: [PATCH] virtual_fuel: make vm_template an attibute + +Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> +--- + deploy/environments/virtual_fuel.py | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py +index f07207f..92a234c 100644 +--- a/deploy/environments/virtual_fuel.py ++++ b/deploy/environments/virtual_fuel.py +@@ -46,6 +46,10 @@ class VirtualFuel(ExecutionEnvironment): + self.temp_dir = tempfile.mkdtemp() + self.vm_name = self.dha.get_node_property(self.fuel_node_id, + 'libvirtName') ++ self.vm_template = '%s/%s' % (self.root_dir, ++ self.dha.get_node_property( ++ self.fuel_node_id, 'libvirtTemplate')) ++ check_file_exists(self.vm_template) + + def __del__(self): + delete(self.temp_dir) +@@ -106,7 +110,7 @@ class VirtualFuel(ExecutionEnvironment): + disk_path = self.create_image(disk_path, disk_size) + + temp_vm_file = '%s/%s' % (self.temp_dir, self.vm_name) +- exec_cmd('cp %s %s' % (vm_template, temp_vm_file)) ++ exec_cmd('cp %s %s' % (self.vm_template, temp_vm_file)) + self.set_vm_nic(temp_vm_file) + vm_definition_overwrite = self.dha.get_vm_definition('fuel') + self.define_vm(self.vm_name, temp_vm_file, disk_path, |