diff options
| author |   Szilard Cserey <szilard.cserey@gmail.com> | 2016-03-09 17:52:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-03-09 17:52:19 +0000 |
| commit | 735dc3a58e599f89e1e214ba41f2a023f97085fb (patch) | |
| tree | b3c56ea959b24acbb645a0fdce329ba92a63f47e /deploy/environments/libvirt_environment.py | |
| parent | bdf4ad5d52b8094bc2f99195ae46f6904e3d42e2 (diff) | |
| parent | 1ef2a5abcdacf3274e4ed17c612835ae10cb34d8 (diff) | |
Merge "Make number of cpus configurable in dha file"
Diffstat (limited to 'deploy/environments/libvirt_environment.py')
| -rw-r--r-- | deploy/environments/libvirt_environment.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/deploy/environments/libvirt_environment.py b/deploy/environments/libvirt_environment.py index 2a09117bc..380262c7e 100644 --- a/deploy/environments/libvirt_environment.py +++ b/deploy/environments/libvirt_environment.py @@ -34,12 +34,8 @@ class LibvirtEnvironment(ExecutionEnvironment): self.net_names = self.collect_net_names() def create_storage(self, node_id, disk_path, disk_sizes): - if node_id == self.fuel_node_id: - disk_size = disk_sizes['fuel'] - else: - roles = self.dea.get_node_role(node_id) - role = 'controller' if 'controller' in roles else 'compute' - disk_size = disk_sizes[role] + role = self.dea.get_node_main_role(node_id, self.fuel_node_id) + disk_size = disk_sizes[role] exec_cmd('qemu-img create -f qcow2 %s %s' % (disk_path, disk_size)) def create_vms(self): @@ -53,9 +49,11 @@ 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) + self.define_vm(vm_name, temp_vm_file, disk_path, number_cpus) delete(temp_dir) def start_vms(self): |