x
/
fuel-plugin-contrail
Code Issues Proposed changes

Expose parameters for zookeeper config 

[US867617]

Change-Id: Ia9c36655f01c62453a20160f96d1830a507e5d19
(cherry picked from commit ea9d101d6e)
This commit is contained in:
Vlad Naboichenko 2017-02-23 15:06:33 -08:00 committed by Illia Polliul
parent 0a3c290360
commit cfe6574c97
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment_scripts/puppet/modules/contrail/manifests/init.pp
View File

@ -206,6 +206,14 @@ class contrail {
$kafka_broker_list = inline_template("<%= scope.lookupvar('contrail::analytics_db_ips').map{ |ip| \"#{ip}:9092\" }.join(' ') %>")
$zk_server_ip = inline_template("<%= scope.lookupvar('contrail::contrail_controller_ips').map{ |ip| \"#{ip}:2181\" }.join(',') %>")
$zk_ticktime = pick($settings['zk_ticktime'], 2000)
$zk_initlimit = pick($settings['zk_initlimit'], 10)
$zk_synclimit = pick($settings['zk_synclimit'], 5)
$zk_datadir = pick($settings['zk_datadir'], '/var/lib/zookeeper')
$zk_clientport = pick($settings['zk_clientport'], 2181)
$zk_maxsessiontimeout = pick($settings['zk_maxsessiontimeout'], 120000)
$zk_autopurge_purgeinterval = pick($settings['zk_autopurge_purgeinterval'], '0')
# Perfomance tuning
$cassandra_rpc_max_threads = pick($settings['cassandra_rpc_max_threads'], false)

13
deployment_scripts/puppet/modules/contrail/templates/zoo.cfg.erb
View File

@ -1,9 +1,10 @@
tickTime=2000
initLimit=10
syncLimit=5
dataDir=/var/lib/zookeeper
clientPort=2181
maxSessionTimeout=120000
tickTime=<%= scope.lookupvar('contrail::zk_ticktime')%>
initLimit=<%= scope.lookupvar('contrail::zk_initlimit')%>
syncLimit=<%= scope.lookupvar('contrail::zk_synclimit')%>
dataDir=<%= scope.lookupvar('contrail::zk_datadir')%>
clientPort=<%= scope.lookupvar('contrail::zk_clientport')%>
maxSessionTimeout=<%= scope.lookupvar('contrail::zk_maxsessiontimeout')%>
autopurge.purgeInterval=<%= scope.lookupvar('contrail::zk_autopurge_purgeinterval')%>
<%-
nodes=scope.lookupvar('contrail::contrail_controller_nodes_hash')
nodes.each_pair do |node_name, node_props|