summaryrefslogtreecommitdiffstats
path: root/deploy/environments/virtual_fuel.py
diff options
context:
space:
mode:
authorDaniel Smith <daniel.smith@ericsson.com>2016-04-05 15:38:09 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-05 15:38:09 +0000
commit27120b363ddd3df5474314204def6607871cad6e (patch)
treed93487ba282ddf4561460ad9ff1b69ab144b52a6 /deploy/environments/virtual_fuel.py
parenteaf3af01c4bdede10bd89bb55c7d572cb424aa85 (diff)
parent25ec9b6a9bfc20f8b5379af71292fd49b8cce12a (diff)
Merge "Configure the infra VMs over DHA"
Diffstat (limited to 'deploy/environments/virtual_fuel.py')
-rw-r--r--deploy/environments/virtual_fuel.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/deploy/environments/virtual_fuel.py b/deploy/environments/virtual_fuel.py
index 62082185f..cb3bc6c51 100644
--- a/deploy/environments/virtual_fuel.py
+++ b/deploy/environments/virtual_fuel.py
@@ -55,12 +55,13 @@ class VirtualFuel(ExecutionEnvironment):
disk_path = '%s/%s.raw' % (self.storage_dir, vm_name)
disk_sizes = self.dha.get_disks()
disk_size = disk_sizes['fuel']
- number_cpus = self.dha.get_number_cpus('fuel')
exec_cmd('qemu-img create -f qcow2 %s %s' % (disk_path, disk_size))
temp_vm_file = '%s/%s' % (temp_dir, vm_name)
exec_cmd('cp %s %s' % (vm_template, temp_vm_file))
self.set_vm_nic(temp_vm_file)
- self.define_vm(vm_name, temp_vm_file, disk_path, number_cpus)
+ vm_definition_overwrite = self.dha.get_vm_definition('fuel')
+ self.define_vm(vm_name, temp_vm_file, disk_path,
+ vm_definition_overwrite)
delete(temp_dir)
def setup_environment(self):