summaryrefslogtreecommitdiffstats
path: root/deploy/environments/virtual_fuel.py
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-03-18 10:26:37 +0100
committerNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-03-18 13:28:54 +0100
commit25ec9b6a9bfc20f8b5379af71292fd49b8cce12a (patch)
treeb5b6d36024ef3f4e833fe60d9676d692deb27fc7 /deploy/environments/virtual_fuel.py
parentbf2a65a28572c90484d0c5668274485721d0f1c7 (diff)
Configure the infra VMs over DHA
This commit enables the full configuration of the VM(fuel/controller/compute) defintion through the dha file. Change-Id: I4e78334d1e5aec1e98667343390283587f0b3ea5
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):