From 5ef8e7de6598146e276d44fc84e9632a7e2d631d Mon Sep 17 00:00:00 2001 From: Thomas S Hatch Date: Tue, 17 May 2011 23:07:46 -0600 Subject: [PATCH] Change the state runner to use the require system --- salt/state.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/salt/state.py b/salt/state.py index aca39fbf3d..12045b104e 100644 --- a/salt/state.py +++ b/salt/state.py @@ -231,13 +231,13 @@ class State(object): running = self.call_chunk(chunk, running, chunks) running = self.call_chunk(low, running, chunks) elif status == 'met': - running[tag] = call(low) + running[tag] = self.call(low) elif status == 'fail': running[tag] = {'changes': None, 'result': False, 'comment': 'One or more require failed'} else: - running[tag] = call(low) + running[tag] = self.call(low) return running def call_high(self, high): @@ -250,11 +250,7 @@ class State(object): errors = self.verify_chunks(chunks) if errors: return errors - for chunk in chunks: - ret = self.call(chunk) - print ret - rets.append(ret) - return rets + return self.call_chunks(chunks) def call_template(self, template): '''