diff --git a/devstack/component.py b/devstack/component.py index 5fc6c53a..9c259014 100644 --- a/devstack/component.py +++ b/devstack/component.py @@ -53,8 +53,8 @@ RUNNER_CLS_MAPPING = { BASE_LINK_DIR = "/etc" # Progress bar titles -UNINSTALL_TITLE = utils.color_text('Uninstalling', 'blue') -INSTALL_TITLE = utils.color_text('Installing', 'blue') +UNINSTALL_TITLE = 'Uninstalling' +INSTALL_TITLE = 'Installing' class ComponentBase(object): diff --git a/devstack/components/db.py b/devstack/components/db.py index 9a55131f..97d53876 100644 --- a/devstack/components/db.py +++ b/devstack/components/db.py @@ -211,7 +211,8 @@ class DBRuntime(comp.EmptyRuntime): combined = combined.lower() if combined.find("running") != -1: return comp.STATUS_STARTED - elif combined.find("stop") != -1: + elif combined.find("stop") != -1 or \ + combined.find('unrecognized') != -1: return comp.STATUS_STOPPED else: return comp.STATUS_UNKNOWN diff --git a/devstack/components/horizon.py b/devstack/components/horizon.py index 117b078b..1ae376b8 100644 --- a/devstack/components/horizon.py +++ b/devstack/components/horizon.py @@ -235,9 +235,11 @@ class HorizonRuntime(comp.EmptyRuntime): (sysout, stderr) = run_result[0] combined = str(sysout) + str(stderr) combined = combined.lower() - if sysout.find("is running") != -1: + if combined.find("is running") != -1: return comp.STATUS_STARTED - elif sysout.find("not running") != -1 or sysout.find("stopped") != -1: + elif combined.find("not running") != -1 or \ + combined.find("stopped") != -1 or \ + combined.find('unrecognized') != -1: return comp.STATUS_STOPPED else: return comp.STATUS_UNKNOWN diff --git a/devstack/components/rabbit.py b/devstack/components/rabbit.py index e1e54199..134e2f79 100644 --- a/devstack/components/rabbit.py +++ b/devstack/components/rabbit.py @@ -105,7 +105,9 @@ class RabbitRuntime(comp.EmptyRuntime): (sysout, stderr) = run_result combined = str(sysout) + str(stderr) combined = combined.lower() - if combined.find('nodedown') != -1 or combined.find("unable to connect to node") != -1: + if combined.find('nodedown') != -1 or \ + combined.find("unable to connect to node") != -1 or \ + combined.find('unrecognized') != -1: return comp.STATUS_STOPPED elif combined.find('running_applications') != -1: return comp.STATUS_STARTED diff --git a/devstack/utils.py b/devstack/utils.py index 37d41780..e472ad77 100644 --- a/devstack/utils.py +++ b/devstack/utils.py @@ -145,7 +145,7 @@ def to_bytes(text): @contextlib.contextmanager def progress_bar(name, max_am): widgets = [ - ' %s: ' % (name), progressbar.Percentage(), + '%s: ' % (name), progressbar.Percentage(), ' ', progressbar.Bar(), ' ', progressbar.ETA(), ]