From ea93a789cbdadbf31d0398ae7f5cb0b2a8f86c32 Mon Sep 17 00:00:00 2001 From: Telles Nobrega Date: Wed, 11 Feb 2015 11:51:54 -0300 Subject: [PATCH] Changing zookeeper to not use version number Sahara-image-elements removed zookeeper's version number from the folder name. Storm needs to adapt to that. Depends on the patch from sahara-image-elements #154889 Change-Id: Ibb39a7b10ea590d817e0ca4db8f6cce812c50687 Closes-bug: #1420838 --- sahara/plugins/storm/plugin.py | 2 +- sahara/plugins/storm/run_scripts.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sahara/plugins/storm/plugin.py b/sahara/plugins/storm/plugin.py index 6abdb791..475d3fda 100644 --- a/sahara/plugins/storm/plugin.py +++ b/sahara/plugins/storm/plugin.py @@ -196,7 +196,7 @@ class StormProvider(p.ProvisioningPluginBase): '/usr/local/storm/conf/storm.yaml': ng_extra['st_instances'] } files_zk = { - '/opt/zookeeper/zookeeper-3.4.6/conf/zoo.cfg': ng_extra['zk_conf'] + '/opt/zookeeper/zookeeper/conf/zoo.cfg': ng_extra['zk_conf'] } files_supervisor_master = { '/etc/supervisor/supervisord.conf': ng_extra['master_sv_conf'] diff --git a/sahara/plugins/storm/run_scripts.py b/sahara/plugins/storm/run_scripts.py index 968f6043..69c6bf69 100644 --- a/sahara/plugins/storm/run_scripts.py +++ b/sahara/plugins/storm/run_scripts.py @@ -21,7 +21,7 @@ LOG = logging.getLogger(__name__) def start_zookeeper(remote): remote.execute_command("sudo %s %s" % ( - "/opt/zookeeper/zookeeper-3.4.6/bin/zkServer.sh", + "/opt/zookeeper/zookeeper/bin/zkServer.sh", "start"))