From 32cfd6c2cc16c3e3048705f93be9fbca89526f41 Mon Sep 17 00:00:00 2001 From: "OTSUKA, Yuanying" Date: Mon, 22 Feb 2016 15:31:57 +0900 Subject: [PATCH] Avoid to create $SCREEN_LOGDIR It is possible not to give SCREEN_LOGDIR variable in devstack. And also, SCREEN_LOGDIR is creating in stack.sh itself [1]. So we can remove our code which is creating SCREEN_LOGDIR. This code breaks stack.sh process if user doesn't give this variable. [1]: https://github.com/openstack-dev/devstack/blob/2688eedc51fc7b4ef0a5332c1aafce8a557928da/stack.sh#L454 Change-Id: I5c6ce81a97635b60fc1633397a24f93dc590fad6 Closes-Bug: #1548197 --- devstack/plugin.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 390f9c820a..b403a26872 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -9,10 +9,7 @@ source $DEST/magnum/devstack/lib/magnum (set -o posix; set) if is_service_enabled m-api m-cond; then - if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then - echo_summary "Before Installing magnum" - mkdir -p $SCREEN_LOGDIR - elif [[ "$1" == "stack" && "$2" == "install" ]]; then + if [[ "$1" == "stack" && "$2" == "install" ]]; then echo_summary "Installing magnum" install_magnum