summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPranesh Pandurangan <praneshpg@gmail.com>2014-06-12 15:15:36 -0700
committerPranesh Pandurangan <praneshpg@gmail.com>2014-06-13 01:48:24 +0000
commit896718560835a5ca248a80eaa2c78a0d65377c8f (patch)
tree6c0c2f3bb7d9d3ec10006bb68eaa09b6874f2c76
parentdcf82d64906d3c5848450f6a4caaf91a65e267c2 (diff)
Use CLI input as react script name
Like in audit scripts, it doesn't make sense to keep a name field in react.json anymore. Use the name passed in CLI instead. Change-Id: Ic6d25505b62b640a7ade2990a927a9ea18bd90eb
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: Joshua Harlow <harlowja@yahoo-inc.com> Workflow+1: Pranesh Pandurangan <praneshpg@gmail.com> Submitted-by: Jenkins Submitted-at: Mon, 16 Jun 2014 23:41:48 +0000 Reviewed-on: https://review.openstack.org/99781 Project: stackforge/entropy Branch: refs/heads/master
-rw-r--r--entropy/engine.py1
-rw-r--r--entropy/examples/repair/react.json1
2 files changed, 1 insertions, 1 deletions
diff --git a/entropy/engine.py b/entropy/engine.py
index 2cd6acf..b9cbb16 100644
--- a/entropy/engine.py
+++ b/entropy/engine.py
@@ -250,6 +250,7 @@ class Engine(object):
250 self.known_queues.append(message_queue) 250 self.known_queues.append(message_queue)
251 self._known_routing_keys.add(data['routing_key']) 251 self._known_routing_keys.add(data['routing_key'])
252 kwargs = data 252 kwargs = data
253 kwargs['name'] = script
253 kwargs['conf'] = script_args['cfg'] 254 kwargs['conf'] = script_args['cfg']
254 kwargs['exchange'] = self.entropy_exchange 255 kwargs['exchange'] = self.entropy_exchange
255 kwargs['message_queue'] = message_queue 256 kwargs['message_queue'] = message_queue
diff --git a/entropy/examples/repair/react.json b/entropy/examples/repair/react.json
index d37c213..3b8dc7d 100644
--- a/entropy/examples/repair/react.json
+++ b/entropy/examples/repair/react.json
@@ -1,5 +1,4 @@
1{ 1{
2 "name" : "react",
3 "script": "/home/praneshp/code/entropy/entropy/examples/repair/react", 2 "script": "/home/praneshp/code/entropy/entropy/examples/repair/react",
4 "hostname" : "localhost", 3 "hostname" : "localhost",
5 "username" : "praneshp", 4 "username" : "praneshp",