From 845528a8476aedf517c41baa666732e3dcab4907 Mon Sep 17 00:00:00 2001 From: Ed Hall Date: Tue, 13 Mar 2012 12:26:00 -0700 Subject: [PATCH] Allow shutdown of qpidd to fail (since it may be missing). Fixes #81 --- conf/pkgs/rabbitmq.json | 2 ++ devstack/shell.py | 2 +- devstack/utils.py | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conf/pkgs/rabbitmq.json b/conf/pkgs/rabbitmq.json index 8da5aa49..ec4afdbc 100644 --- a/conf/pkgs/rabbitmq.json +++ b/conf/pkgs/rabbitmq.json @@ -21,6 +21,7 @@ { # Qpidd runs on the same port "run_as_root": true, + "ignore_failure": true, "cmd": [ "service", "qpidd", @@ -30,6 +31,7 @@ { # Qpidd runs on the same port "run_as_root": true, + "ignore_failure": true, "cmd": [ "chkconfig", "qpidd", diff --git a/devstack/shell.py b/devstack/shell.py index e9d5f7b7..9ec4608b 100644 --- a/devstack/shell.py +++ b/devstack/shell.py @@ -81,7 +81,7 @@ def execute(*cmd, **kwargs): cwd = kwargs.pop('cwd', None) env_overrides = kwargs.pop('env_overrides', None) close_stdin = kwargs.pop('close_stdin', False) - ignore_exit_code = False + ignore_exit_code = kwargs.pop('ignore_exit_code', False) if isinstance(check_exit_code, bool): ignore_exit_code = not check_exit_code diff --git a/devstack/utils.py b/devstack/utils.py index 7e4aade0..7dddb6ee 100644 --- a/devstack/utils.py +++ b/devstack/utils.py @@ -90,7 +90,9 @@ def execute_template(*cmds, **kargs): stdin = joinlinesep(*stdin_full) exec_result = sh.execute(*cmd_to_run, run_as_root=cmdinfo.get('run_as_root', False), - process_input=stdin, **kargs) + process_input=stdin, + ignore_exit_code=cmdinfo.get('ignore_failure', False), + **kargs) cmd_results.append(exec_result) return cmd_results