x/puppet-midonet
Code Issues Proposed changes

Enable everything so Insights work when deployed

Browse Source 
Also pin puppetlabs-apt, as the newest version of the module breaks all
tests.

Change-Id: Iaf8b390f85c91f84e5157bd11eb061feb53ad9e2
This commit is contained in:
Alejandro Andreu 2017-06-01 17:35:16 +02:00
parent c4c694d561
commit e900e1836d
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Puppetfile
View File

@ -13,7 +13,7 @@ mod 'puppet-neutron',
## External modules ## External modules
mod 'puppetlabs/inifile' mod 'puppetlabs/inifile'
mod 'puppetlabs/apt' mod 'puppetlabs/apt', '2.4.0'
mod 'puppetlabs/java' mod 'puppetlabs/java'
mod 'puppetlabs/stdlib' mod 'puppetlabs/stdlib'
mod 'puppetlabs/apache' mod 'puppetlabs/apache'

2
manifests/cluster/run.pp
View File

@ -256,8 +256,10 @@ class midonet::cluster::run (
content => template('midonet/analytics/analytics_settings.sh.erb'), content => template('midonet/analytics/analytics_settings.sh.erb'),
require => Exec['/bin/bash /tmp/analytics_settings.sh'] require => Exec['/bin/bash /tmp/analytics_settings.sh']
} -> } ->
# As we will only be deploying MidoNet 5.4 we can set a single notify here
exec { '/bin/bash /tmp/analytics_settings_local.sh': exec { '/bin/bash /tmp/analytics_settings_local.sh':
require => File['set_config'], require => File['set_config'],
notify => Service['midonet-cluster'],
} }
} }
} }

6
templates/analytics/analytics_settings.erb
View File

@ -1,7 +1,11 @@
<% if @new_api %> <% if @new_api %>
agent.flow_history.enabled : true agent.flow_history.enabled : true
agent.flow_history.encoding : "binary"
insights.jmxscraper.enabled : true insights.jmxscraper.enabled : true
insights.bigdata.enabled : true
insights.flow_tracing.enabled : true
insights.analytics_api.enabled : true
insights.endpoint.enabled : true
agent.flow_history.encoding : "binary"
insights.jmxscraper.target.endpoint : "<%= @elk_target_endpoint %>" insights.jmxscraper.target.endpoint : "<%= @elk_target_endpoint %>"
insights.elasticsearch.seeds : [<%= @elk_seeds %>] insights.elasticsearch.seeds : [<%= @elk_seeds %>]
<% if @elk_cluster_name %>insights.elasticsearch.cluster_name : "<%= @elk_cluster_name %>"<% end %> <% if @elk_cluster_name %>insights.elasticsearch.cluster_name : "<%= @elk_cluster_name %>"<% end %>