diff options
| author |   Daniel Smith <daniel.smith@ericsson.com> | 2016-04-05 15:38:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-04-05 15:38:09 +0000 |
| commit | 27120b363ddd3df5474314204def6607871cad6e (patch) | |
| tree | d93487ba282ddf4561460ad9ff1b69ab144b52a6 /deploy/environments/libvirt_environment.py | |
| parent | eaf3af01c4bdede10bd89bb55c7d572cb424aa85 (diff) | |
| parent | 25ec9b6a9bfc20f8b5379af71292fd49b8cce12a (diff) | |
Merge "Configure the infra VMs over DHA"
Diffstat (limited to 'deploy/environments/libvirt_environment.py')
| -rw-r--r-- | deploy/environments/libvirt_environment.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/deploy/environments/libvirt_environment.py b/deploy/environments/libvirt_environment.py index 380262c7e..c9fa41fd7 100644 --- a/deploy/environments/libvirt_environment.py +++ b/deploy/environments/libvirt_environment.py @@ -49,11 +49,12 @@ class LibvirtEnvironment(ExecutionEnvironment): check_file_exists(vm_template) disk_path = '%s/%s.raw' % (self.storage_dir, vm_name) self.create_storage(node_id, disk_path, disk_sizes) - number_cpus = self.dha.get_number_cpus( - self.dea.get_node_main_role(node_id, self.fuel_node_id)) temp_vm_file = '%s/%s' % (temp_dir, vm_name) exec_cmd('cp %s %s' % (vm_template, temp_vm_file)) - self.define_vm(vm_name, temp_vm_file, disk_path, number_cpus) + vm_definition_overwrite = self.dha.get_vm_definition( + self.dea.get_node_main_role(node_id, self.fuel_node_id)) + self.define_vm(vm_name, temp_vm_file, disk_path, + vm_definition_overwrite) delete(temp_dir) def start_vms(self): |