diff options
author | Dan Radez <dradez@redhat.com> | 2017-10-05 15:17:53 -0400 |
---|---|---|
committer | Dan Radez <dradez@redhat.com> | 2017-10-11 14:06:52 -0400 |
commit | ca7b8665dce213c51ae1e15dceede7cc9fba97c1 (patch) | |
tree | 8125a5baf0305422a38c97d694073822f5d473bc /apex/overcloud/overcloud_deploy.py | |
parent | 0fc3c2190ad304052d0ec210c94ab3f09e95b71d (diff) |
Updates to Inventory object
- moved get_node_counts over from overcloud/deploy.py
- added more test coverage
Change-Id: I7774bebb99169aa1da0f07cb2cfc0c1d197af5ca
Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'apex/overcloud/overcloud_deploy.py')
-rw-r--r-- | apex/overcloud/overcloud_deploy.py | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py index e3248536..ef916a43 100644 --- a/apex/overcloud/overcloud_deploy.py +++ b/apex/overcloud/overcloud_deploy.py @@ -93,34 +93,6 @@ def build_sdn_env_list(ds, sdn_map, env_list=None): return env_list -def _get_node_counts(inventory): - """ - Return numbers of controller and compute nodes in inventory - - :param inventory: node inventory data structure - :return: number of controller and compute nodes in inventory - """ - if not inventory: - raise ApexDeployException("Empty inventory") - - nodes = inventory['nodes'] - num_control = 0 - num_compute = 0 - for node in nodes: - if node['capabilities'] == 'profile:control': - num_control += 1 - elif node['capabilities'] == 'profile:compute': - num_compute += 1 - else: - # TODO(trozet) do we want to allow capabilities to not exist? - logging.error("Every node must include a 'capabilities' key " - "tagged with either 'profile:control' or " - "'profile:compute'") - raise ApexDeployException("Node missing capabilities " - "key: {}".format(node)) - return num_control, num_compute - - def create_deploy_cmd(ds, ns, inv, tmp_dir, virtual, env_file='opnfv-environment.yaml'): @@ -146,7 +118,7 @@ def create_deploy_cmd(ds, ns, inv, tmp_dir, else: deploy_options.append('baremetal-environment.yaml') - num_control, num_compute = _get_node_counts(inv) + num_control, num_compute = inv.get_node_counts() if num_control == 0 or num_compute == 0: logging.error("Detected 0 control or compute nodes. Control nodes: " "{}, compute nodes{}".format(num_control, num_compute)) @@ -410,7 +382,7 @@ def prep_env(ds, ns, inv, opnfv_env, net_env, tmp_dir): if 'OS::TripleO::Services::NeutronDhcpAgent' in line: output_line = '' elif 'NeutronDhcpAgentsPerNetwork' in line: - num_control, num_compute = _get_node_counts(inv) + num_control, num_compute = inv.get_node_counts() output_line = (" NeutronDhcpAgentsPerNetwork: {}" .format(num_compute)) elif 'ComputeServices' in line: |