openstack/deb-sahara
Code Issues Proposed changes

Merge "Changing zookeeper to not use version number"

Browse Source
This commit is contained in:
Jenkins 2015-02-16 18:36:03 +00:00 committed by Gerrit Code Review
commit 5288f5c73b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara/plugins/storm/plugin.py
View File

@ -196,7 +196,7 @@ class StormProvider(p.ProvisioningPluginBase):
'/usr/local/storm/conf/storm.yaml': ng_extra['st_instances'] '/usr/local/storm/conf/storm.yaml': ng_extra['st_instances']
} }
files_zk = { 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 = { files_supervisor_master = {
'/etc/supervisor/supervisord.conf': ng_extra['master_sv_conf'] '/etc/supervisor/supervisord.conf': ng_extra['master_sv_conf']

2
sahara/plugins/storm/run_scripts.py
View File

@ -21,7 +21,7 @@ LOG = logging.getLogger(__name__)
def start_zookeeper(remote): def start_zookeeper(remote):
remote.execute_command("sudo %s %s" % ( remote.execute_command("sudo %s %s" % (
"/opt/zookeeper/zookeeper-3.4.6/bin/zkServer.sh", "/opt/zookeeper/zookeeper/bin/zkServer.sh",
"start")) "start"))