From dcced9a5667e75c27811812fb317ff832313098c Mon Sep 17 00:00:00 2001 From: Thomas S Hatch Date: Fri, 17 Oct 2014 15:05:21 -0600 Subject: [PATCH 1/2] pack in the state_aggregate option --- salt/state.py | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/state.py b/salt/state.py index 435fb4eb00..86b5cbb7d9 100644 --- a/salt/state.py +++ b/salt/state.py @@ -2148,6 +2148,7 @@ class BaseHighState(object): opts['state_auto_order']) opts['file_roots'] = mopts['file_roots'] opts['state_events'] = mopts.get('state_events') + opts['state_aggregate'] = mopts.get('state_aggregate', opts.get('state_aggregate', False)) opts['jinja_lstrip_blocks'] = mopts.get('jinja_lstrip_blocks', False) opts['jinja_trim_blocks'] = mopts.get('jinja_trim_blocks', False) return opts From 84a7d247a5a82dc1f3d4554e7ceea2a266b6ff24 Mon Sep 17 00:00:00 2001 From: Thomas S Hatch Date: Fri, 17 Oct 2014 15:08:12 -0600 Subject: [PATCH 2/2] send down the state_aggregate opts durring state runs --- salt/daemons/masterapi.py | 1 + salt/master.py | 1 + 2 files changed, 2 insertions(+) diff --git a/salt/daemons/masterapi.py b/salt/daemons/masterapi.py index c9e3918fd6..9890d4d31a 100644 --- a/salt/daemons/masterapi.py +++ b/salt/daemons/masterapi.py @@ -440,6 +440,7 @@ class RemoteFuncs(object): mopts['nodegroups'] = self.opts['nodegroups'] mopts['state_auto_order'] = self.opts['state_auto_order'] mopts['state_events'] = self.opts['state_events'] + mopts['state_aggregate'] = self.opts['state_aggregate'] mopts['jinja_lstrip_blocks'] = self.opts['jinja_lstrip_blocks'] mopts['jinja_trim_blocks'] = self.opts['jinja_trim_blocks'] return mopts diff --git a/salt/master.py b/salt/master.py index 938e9ad644..8d79010da2 100644 --- a/salt/master.py +++ b/salt/master.py @@ -928,6 +928,7 @@ class AESFuncs(object): mopts['nodegroups'] = self.opts['nodegroups'] mopts['state_auto_order'] = self.opts['state_auto_order'] mopts['state_events'] = self.opts['state_events'] + mopts['state_aggregate'] = self.opts['state_aggregate'] mopts['jinja_lstrip_blocks'] = self.opts['jinja_lstrip_blocks'] mopts['jinja_trim_blocks'] = self.opts['jinja_trim_blocks'] return mopts