summaryrefslogtreecommitdiffstats
path: root/deploy/dha_adapters
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-03-18 10:26:37 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-04-10 18:47:44 +0200
commit875d2f23d76d4dfb4f962f578aaae7bc089af5a7 (patch)
tree4f7abbbc44538d4640402915a8b8c1f7850ae0aa /deploy/dha_adapters
parente6fef82a5d952dbfb28b9f5db961721a128d805d (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/dha_adapters')
-rw-r--r--deploy/dha_adapters/hardware_adapter.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/deploy/dha_adapters/hardware_adapter.py b/deploy/dha_adapters/hardware_adapter.py
index 55bb4002e..aa59581ee 100644
--- a/deploy/dha_adapters/hardware_adapter.py
+++ b/deploy/dha_adapters/hardware_adapter.py
@@ -59,7 +59,7 @@ class HardwareAdapter(object):
def get_disks(self):
return self.dha_struct['disks']
- def get_number_cpus(self, role):
- role_cpus_dict = self.dha_struct.get('number_cpus')
- if role_cpus_dict:
- return role_cpus_dict.get(role)
+ def get_vm_definition(self, role):
+ vm_definition = self.dha_struct.get('define_vms')
+ if vm_definition:
+ return vm_definition.get(role)