x/anvil
Code Issues Proposed changes

Merge branch 'master' of github.com:yahoo/Openstack-DevstackPy

Browse Source
This commit is contained in:
Joshua Harlow 2012-03-13 13:22:24 -07:00
commit f894e8767f
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -4,6 +4,7 @@ Joshua Harlow <harlowja@yahoo-inc.com>
Ken Thomas <krt@yahoo-inc.com> Ken Thomas <krt@yahoo-inc.com>
Gunther Hagleitner <hagleitn@yahoo-inc.com> Gunther Hagleitner <hagleitn@yahoo-inc.com>
Chris Wright <chrisw@sous-sol.org> Chris Wright <chrisw@sous-sol.org>
Ed Hall <edhall@yahoo-inc.com>
V1 V1
-- --

2
conf/pkgs/rabbitmq.json
View File

@ -21,6 +21,7 @@
{ {
# Qpidd runs on the same port # Qpidd runs on the same port
"run_as_root": true, "run_as_root": true,
"ignore_failure": true,
"cmd": [ "cmd": [
"service", "service",
"qpidd", "qpidd",
@ -30,6 +31,7 @@
{ {
# Qpidd runs on the same port # Qpidd runs on the same port
"run_as_root": true, "run_as_root": true,
"ignore_failure": true,
"cmd": [ "cmd": [
"chkconfig", "chkconfig",
"qpidd", "qpidd",

2
devstack/shell.py
View File

@ -81,7 +81,7 @@ def execute(*cmd, **kwargs):
cwd = kwargs.pop('cwd', None) cwd = kwargs.pop('cwd', None)
env_overrides = kwargs.pop('env_overrides', None) env_overrides = kwargs.pop('env_overrides', None)
close_stdin = kwargs.pop('close_stdin', False) 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): if isinstance(check_exit_code, bool):
ignore_exit_code = not check_exit_code ignore_exit_code = not check_exit_code

4
devstack/utils.py
View File

@ -115,7 +115,9 @@ def execute_template(*cmds, **kargs):
stdin = joinlinesep(*stdin_full) stdin = joinlinesep(*stdin_full)
exec_result = sh.execute(*cmd_to_run, exec_result = sh.execute(*cmd_to_run,
run_as_root=cmdinfo.get('run_as_root', False), 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) cmd_results.append(exec_result)
return cmd_results return cmd_results