diff options
| -rw-r--r-- | opnfv/deployment/factory.py | 3 | ||||
| -rw-r--r-- | opnfv/deployment/manager.py | 5 |
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!') |