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

AUTHORS

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

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",

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

devstack/utils.py

@@ -115,7 +115,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