diff options
author | Jose Lausuch <jose.lausuch@ericsson.com> | 2017-02-21 19:18:05 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-02-21 19:18:05 +0000 |
commit | d20e7e38dc092c3f004139736dc02572160c80fa (patch) | |
tree | ec07401627d384109d8740364ff8690d016482b3 /opnfv/deployment/fuel/adapter.py | |
parent | 1bac154de0093d594dac97f54f6df89243ac06a6 (diff) | |
parent | c8b24f8e66595556749fea5f6f305e8c298b5b06 (diff) |
Merge "[deployment_handler] Fix some nits and improve output"
Diffstat (limited to 'opnfv/deployment/fuel/adapter.py')
-rw-r--r-- | opnfv/deployment/fuel/adapter.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/opnfv/deployment/fuel/adapter.py b/opnfv/deployment/fuel/adapter.py index 4ba9ca9..a71d6cb 100644 --- a/opnfv/deployment/fuel/adapter.py +++ b/opnfv/deployment/fuel/adapter.py @@ -170,26 +170,30 @@ class FuelAdapter(manager.DeploymentHandler): cmd = 'source openrc;nova-manage version 2>/dev/null' version = None for node in self.nodes: - if node.is_controller(): + if node.is_controller() and node.is_active(): version = node.run_cmd(cmd) break return version def get_sdn_version(self): - cmd = "apt-cache show opendaylight|grep Version|sed 's/^.*\: //'" + cmd = "apt-cache show opendaylight|grep Version" version = None for node in self.nodes: - if node.is_controller(): + if manager.Role.ODL in node.roles and node.is_active(): odl_version = node.run_cmd(cmd) if odl_version: - version = 'OpenDaylight ' + odl_version - break + version = 'OpenDaylight ' + odl_version.split(' ')[-1] + break return version def get_deployment_status(self): - cmd = 'fuel env|grep operational' + cmd = "fuel env|tail -1|awk '{print $3}'" result = self.installer_node.run_cmd(cmd) if result is None or len(result) == 0: - return 'failed' + return 'unknown' + elif 'operational' in result: + return 'active' + elif 'deploy' in result: + return 'deploying' else: return 'active' |