diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2017-02-23 00:17:04 +0100 |
|---|---|---|
| committer |   Aric Gardner <agardner@linuxfoundation.org> | 2017-02-23 21:35:41 +0000 |
| commit | 603db413bb575c94061f8290b4a4de129ab3fdab (patch) | |
| tree | 7550d48c4231658a927ee20ac87f291fb6ba2829 /modules/opnfv | |
| parent | 7c884f20358121fb0f4a332db613c0f1a07e365a (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>
Diffstat (limited to 'modules/opnfv')
| -rw-r--r-- | modules/opnfv/deployment/factory.py | 3 | ||||
| -rw-r--r-- | modules/opnfv/deployment/manager.py | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/opnfv/deployment/factory.py b/modules/opnfv/deployment/factory.py index e48a751ad..1ccee4e80 100644 --- a/modules/opnfv/deployment/factory.py +++ b/modules/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/modules/opnfv/deployment/manager.py b/modules/opnfv/deployment/manager.py index 7047a4dd3..df735f157 100644 --- a/modules/opnfv/deployment/manager.py +++ b/modules/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!') |