aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2017-02-23 00:17:04 +0100
committerAric Gardner <agardner@linuxfoundation.org>2017-02-23 21:35:41 +0000
commit7a6664e5bacdd8b3730aae8e0f8e6e0ff3b918ba (patch)
treeb8158b22ccec40c1e118df988508003825db0b7e
parentce38fb01e5b179214573b66ffb6ce6c23fa8525c (diff)
[deployment_handler] Fix problem when trying to run ovs-vsctl on Fuel
When creating a Node object, it fetches the ovs version in the init method. This prevents doing this if the node is the installer. Anyways, the information about the installer node is not showed. Error: opnfv.deployment.manager - ERROR - error bash: ovs-vsctl: command not found Example of this output: https://build.opnfv.org/ci/view/functest/job/functest-fuel-baremetal-daily-master/1161/consoleFull Change-Id: I7b5d41af438e18dffa3b1eab2c9279164a4d4fc2 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
-rw-r--r--opnfv/deployment/factory.py3
-rw-r--r--opnfv/deployment/manager.py5
2 files changed, 5 insertions, 3 deletions
diff --git a/opnfv/deployment/factory.py b/opnfv/deployment/factory.py
index e48a751..1ccee4e 100644
--- a/opnfv/deployment/factory.py
+++ b/opnfv/deployment/factory.py
@@ -41,4 +41,5 @@ class Factory(object):
installer_user=installer_user,
installer_pwd=installer_pwd)
else:
- raise Exception("Installer adapter is not implemented.")
+ raise Exception("Installer adapter is not implemented for "
+ "the given installer.")
diff --git a/opnfv/deployment/manager.py b/opnfv/deployment/manager.py
index 7047a4d..df735f1 100644
--- a/opnfv/deployment/manager.py
+++ b/opnfv/deployment/manager.py
@@ -95,6 +95,7 @@ class Deployment(object):
class Role():
+ INSTALLER = 'installer'
CONTROLLER = 'controller'
COMPUTE = 'compute'
ODL = 'opendaylight'
@@ -131,7 +132,7 @@ class Node(object):
self.memory = 'unknown'
self.ovs = 'unknown'
- if ssh_client:
+ if ssh_client and Role.INSTALLER not in self.roles:
sys_info = self.get_system_info()
self.cpu_info = sys_info['cpu_info']
self.memory = sys_info['memory']
@@ -318,7 +319,7 @@ class DeploymentHandler(object):
name=installer,
status=NodeStatus.STATUS_OK,
ssh_client=self.installer_connection,
- roles='installer node')
+ roles=Role.INSTALLER)
else:
raise Exception(
'Cannot establish connection to the installer node!')