From f33c07b8fb214e9451096609e17703fb750d7edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Suchomel?= Date: Thu, 14 Mar 2019 12:05:24 +0100 Subject: [PATCH] [nova] Do not throw out stdout of nova-manage --version "nova-manage --version" used to print to stderr, but at least since Rocky it prints to stdout Change-Id: I48e46612e17556babc35263355c6749c70fd8711 --- nova/templates/bin/_cell-setup.sh.tpl | 2 +- nova/templates/bin/_db-sync.sh.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/templates/bin/_cell-setup.sh.tpl b/nova/templates/bin/_cell-setup.sh.tpl index 31f1cac4af..abd1ffa57a 100644 --- a/nova/templates/bin/_cell-setup.sh.tpl +++ b/nova/templates/bin/_cell-setup.sh.tpl @@ -18,7 +18,7 @@ limitations under the License. set -ex -NOVA_VERSION=$(nova-manage --version 2>&1 > /dev/null) +NOVA_VERSION=$(nova-manage --version 2>&1) # NOTE(portdirect): check if nova fully supports cells v2, and manage # accordingly. Support was complete in ocata (V14.x.x). diff --git a/nova/templates/bin/_db-sync.sh.tpl b/nova/templates/bin/_db-sync.sh.tpl index 5177164963..c44666574a 100644 --- a/nova/templates/bin/_db-sync.sh.tpl +++ b/nova/templates/bin/_db-sync.sh.tpl @@ -18,7 +18,7 @@ limitations under the License. set -ex -NOVA_VERSION=$(nova-manage --version 2>&1 > /dev/null) +NOVA_VERSION=$(nova-manage --version 2>&1) function manage_cells () { # NOTE(portdirect): check if nova fully supports cells v2, and manage