x
/
puppet-midonet
Code Issues Proposed changes

Merge "Fix the paths for analytics , so service doesnt 💣"

This commit is contained in:
Jenkins 2017-03-06 14:50:03 +00:00 committed by Gerrit Code Review
parent 3fb3d39896 581bee3b82
commit 3c0c9cb491
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/analytics/services.pp
View File

@ -74,15 +74,15 @@ class midonet::analytics::services (
elsif $::osfamily == 'Debian' { elsif $::osfamily == 'Debian' {
$analytics_notifications = undef $analytics_notifications = undef
exec {'update-ca-certificates -f': exec {'update-ca-certificates -f':
path => ['/usr/bin', '/usr/sbin','/bin'], path => ['/usr/bin', '/usr/sbin','/sbin','/bin'],
before => Package['midonet_tools'], before => Package['midonet_tools'],
} }
exec { $logstash_command: exec { $logstash_command:
path => ['/usr/bin', '/usr/sbin','/sbin'], path => ['/usr/bin', '/usr/sbin','/sbin','/bin'],
require => Package['analytics'], require => Package['analytics'],
} }
exec { 'service elasticsearch-es-01 restart': exec { 'service elasticsearch-es-01 restart':
path => ['/usr/bin', '/usr/sbin',], path => ['/usr/bin', '/usr/sbin','/bin','/sbin'],
require => Package['analytics'], require => Package['analytics'],
} }
} }

8
manifests/mem.pp
View File

@ -187,11 +187,11 @@ class midonet::mem(
$mem_login_host = "${api_proto}${cluster_ip}${mem_api_port}" $mem_login_host = "${api_proto}${cluster_ip}${mem_api_port}"
$mem_trace_api_host = "${api_proto}${cluster_ip}${mem_api_port}" $mem_trace_api_host = "${api_proto}${cluster_ip}${mem_api_port}"
$mem_traces_ws_url = "${$mem_ws}${cluster_ip}${mem_trace_port}/${mem_trace_namespace}" $mem_traces_ws_url = "${mem_ws}${cluster_ip}${mem_trace_port}/${mem_trace_namespace}"
$mem_api_host = "${api_proto}${cluster_ip}${mem_api_port}" $mem_api_host = "${api_proto}${cluster_ip}${mem_api_port}"
$mem_analytics_ws_api_url = "${$mem_ws}${analytics_ip}${mem_analytics_port}/${mem_analytics_namespace}" $mem_analytics_ws_api_url = "${mem_ws}${analytics_ip}${mem_analytics_port}/${mem_analytics_namespace}"
$mem_subscriptions_ws_api_url = "${$mem_ws}${cluster_ip}${mem_subscription_port}/subscription" $mem_subscriptions_ws_api_url = "${mem_ws}${cluster_ip}${mem_subscription_port}/subscription"
$mem_fabric_ws_api_url = "${$mem_ws}${cluster_ip}${mem_fabric_port}/fabric" $mem_fabric_ws_api_url = "${mem_ws}${cluster_ip}${mem_fabric_port}/fabric"
$mem_apache_servername = $cluster_ip $mem_apache_servername = $cluster_ip