diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-31 22:34:54 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-04 16:04:52 +0000 |
commit | e7e2d84bec0d404057bce203f9c90231360e88ee (patch) | |
tree | 43e54e897217da67906580991c3c7f0a110250e8 /patches/opnfv-fuel/0017-virtual_fuel-make-vm_template-an-attibute.patch | |
parent | 70f2caa773fc5f0e2b1154a5c095665375f02666 (diff) |
Rebase: deploy related patch series.
After change "common.py: catch stderr in exec_cmd" [1] and other
unrelated changes were merged upstream,
we need to rebase the complete deploy related series.
While we're at it, re-export Fuel@OPNFV patches in Armband.
[1] https://gerrit.opnfv.org/gerrit/#/c/14561/
Change-Id: Icbc8261c2e24e4b29e8f5f2bc83db6829219129a
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, 0 insertions, 33 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 deleted file mode 100644 index db602029..00000000 --- a/patches/opnfv-fuel/0017-virtual_fuel-make-vm_template-an-attibute.patch +++ /dev/null @@ -1,33 +0,0 @@ -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, |