aboutsummaryrefslogtreecommitdiffstats
path: root/opnfv/deployment/manager.py
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2017-02-08 14:25:34 +0100
committerJose Lausuch <jose.lausuch@ericsson.com>2017-02-14 17:48:07 +0000
commit2f0c4e1baa6a45dc451142f1372c48e69a5d1565 (patch)
tree4ec67d57795ff32bd04bef03d5440cabf9baeeef /opnfv/deployment/manager.py
parentf169fa760059f91ba68960a7f87ca915e7d0ddaf (diff)
[deployment handler] Add support for Clusters in Fuel
Fix minor apex issues. Output of example.py http://pastebin.com/raw/x70Uj85V Change-Id: I6013f5c4d916126f79afd40a6d6a35278c8ed26f Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
Diffstat (limited to 'opnfv/deployment/manager.py')
-rw-r--r--opnfv/deployment/manager.py12
1 files changed, 3 insertions, 9 deletions
diff --git a/opnfv/deployment/manager.py b/opnfv/deployment/manager.py
index 9f77ff0..8c9599b 100644
--- a/opnfv/deployment/manager.py
+++ b/opnfv/deployment/manager.py
@@ -243,7 +243,7 @@ class DeploymentHandler(object):
raise Exception(
'Cannot establish connection to the installer node!')
- self.nodes = self.nodes()
+ self.nodes = self.get_nodes()
@abstractmethod
def get_openstack_version(self):
@@ -267,18 +267,12 @@ class DeploymentHandler(object):
raise Exception(DeploymentHandler.FUNCTION_NOT_IMPLEMENTED)
@abstractmethod
- def nodes(self, options=None):
+ def get_nodes(self, options=None):
'''
Generates a list of all the nodes in the deployment
'''
raise Exception(DeploymentHandler.FUNCTION_NOT_IMPLEMENTED)
- def get_nodes(self, options=None):
- '''
- Returns the list of Node objects
- '''
- return self.nodes
-
def get_installer_node(self):
'''
Returns the installer node object
@@ -296,4 +290,4 @@ class DeploymentHandler(object):
pod=os.getenv('NODE_NAME', 'Unknown'),
openstack_version=self.get_openstack_version(),
sdn_controller=self.get_sdn_version(),
- nodes=self.nodes)
+ nodes=self.get_nodes())