diff --git a/manifests/analytics/services.pp b/manifests/analytics/services.pp index 7378311..730feff 100644 --- a/manifests/analytics/services.pp +++ b/manifests/analytics/services.pp @@ -74,15 +74,15 @@ class midonet::analytics::services ( elsif $::osfamily == 'Debian' { $analytics_notifications = undef exec {'update-ca-certificates -f': - path => ['/usr/bin', '/usr/sbin','/bin'], + path => ['/usr/bin', '/usr/sbin','/sbin','/bin'], before => Package['midonet_tools'], } exec { $logstash_command: - path => ['/usr/bin', '/usr/sbin','/sbin'], + path => ['/usr/bin', '/usr/sbin','/sbin','/bin'], require => Package['analytics'], } exec { 'service elasticsearch-es-01 restart': - path => ['/usr/bin', '/usr/sbin',], + path => ['/usr/bin', '/usr/sbin','/bin','/sbin'], require => Package['analytics'], } } diff --git a/manifests/mem.pp b/manifests/mem.pp index dbb3916..de26788 100644 --- a/manifests/mem.pp +++ b/manifests/mem.pp @@ -187,11 +187,11 @@ class midonet::mem( $mem_login_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_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_fabric_ws_api_url = "${$mem_ws}${cluster_ip}${mem_fabric_port}/fabric" + $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_fabric_ws_api_url = "${mem_ws}${cluster_ip}${mem_fabric_port}/fabric" $mem_apache_servername = $cluster_ip