diff options
| author |   Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2016-03-18 10:26:37 +0100 |
|---|---|---|
| committer | Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2016-03-18 13:28:54 +0100 |
| commit | 25ec9b6a9bfc20f8b5379af71292fd49b8cce12a (patch) | |
| tree | b5b6d36024ef3f4e833fe60d9676d692deb27fc7 /deploy/environments/libvirt_environment.py | |
| parent | bf2a65a28572c90484d0c5668274485721d0f1c7 (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/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): |