Merge "Closes-Bug : #1437938"

Juniper · May 3, 2015 · fb49a99 · fb49a99
2 parents be347f7 + f368a92
commit fb49a99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/contrail/environment/modules/contrail/manifests/collector.pp b/contrail/environment/modules/contrail/manifests/collector.pp
@@ -168,6 +168,7 @@
 	ensure  => present,
 	require => Package["contrail-openstack-analytics"],
 	content => template("$module_name/contrail-topology.conf.erb"),
+    }
     ->
     file { "/etc/contrail/contrail-alarm-gen.conf" :
 	ensure  => present,

diff --git a/contrail/environment/modules/contrail/templates/contrail-alarm-gen.conf.erb b/contrail/environment/modules/contrail/templates/contrail-alarm-gen.conf.erb
@@ -4,7 +4,7 @@ log_local = 1
 log_level = SYS_NOTICE
 #log_category =
 log_file = /var/log/contrail/contrail-alarm-gen.log
-kafka_broker_list=<%= @database_ip_list.map{ |ip| "#{ip}:9092" }.join(' ') 
+kafka_broker_list=<%= @database_ip_list.map{ |ip| "#{ip}:9092" }.join(' ')  %>
 zk_list=<%= @zookeeper_ip_list.map{ |ip| "#{ip}:#{@zk_ip_port}" }.join(',') %>
 
 [DISCOVERY]