x/puppet-midonet
Code Issues Proposed changes

Parametrizes all MEM ports

Browse Source 
Change-Id: I6579e0e2fac24b2958d4199a30bd12022efd5922
This commit is contained in:
Alejandro Andreu 2016-10-28 11:29:41 +02:00
parent 67e502e936
commit 1e3125bb8d
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
manifests/mem.pp
View File

@ -118,7 +118,13 @@ class midonet::mem(
$ssl_cert = '',
$ssl_key = '',
$insights_ssl = undef,
$proxypassed = false
$proxypassed = false,
$mem_api_port = '8181',
$mem_trace_port = '8460',
$mem_analytics_port = '8080',
$mem_subscription_port = '8007',
$mem_fabric_port = '8009',
) inherits midonet::params {
$mem_ws = $insights_ssl? {true => 'wss://' , default => 'ws://'}
@ -133,13 +139,13 @@ class midonet::mem(
validate_string($mem_config_file)
validate_string($mem_agent_config_api_namespace)
$mem_login_host = "http://${cluster_ip}:8181"
$mem_trace_api_host = "http://${cluster_ip}:8181"
$mem_traces_ws_url = "wss://${cluster_ip}:8460/${mem_trace_namespace}"
$mem_api_host = "http://${cluster_ip}:8181"
$mem_analytics_ws_api_url = "ws://${analytics_ip}:8080/${mem_analytics_namespace}"
$mem_subscriptions_ws_api_url = "wss://${cluster_ip}:8007/subscription"
$mem_fabric_ws_api_url = "wss://${cluster_ip}:8009/fabric"
$mem_login_host = "http://${cluster_ip}:${mem_api_port}"
$mem_trace_api_host = "http://${cluster_ip}:${mem_api_port}"
$mem_traces_ws_url = "wss://${cluster_ip}:${mem_trace_port}/${mem_trace_namespace}"
$mem_api_host = "http://${cluster_ip}:${mem_api_port}"
$mem_analytics_ws_api_url = "ws://${analytics_ip}:${mem_analytics_port}/${mem_analytics_namespace}"
$mem_subscriptions_ws_api_url = "wss://${cluster_ip}:${mem_subscription_port}/subscription"
$mem_fabric_ws_api_url = "wss://${cluster_ip}:${mem_fabric_port}/fabric"
$mem_apache_servername = $cluster_ip
@ -176,6 +182,9 @@ class midonet::mem(
is_ssl => $is_ssl,
ssl_cert => $ssl_cert,
ssl_key => $ssl_key,
mem_api_port => $mem_api_port,
mem_trace_port => $mem_trace_port,
mem_analytics_port => $mem_analytics_port,
}
}
else {

15
manifests/mem/vhost.pp
View File

@ -58,7 +58,10 @@ class midonet::mem::vhost (
$is_ssl = undef,
$ssl_cert = undef,
$ssl_key = undef,
$priority = undef
$priority = undef,
$mem_api_port = '8181',
$mem_trace_port = '8460',
$mem_analytics_port = '8080',
) inherits midonet::params {
$aliases = [
@ -80,15 +83,15 @@ class midonet::mem::vhost (
$proxy_pass = [
{
'path' => "/${mem_api_namespace}",
'url' => "http://${cluster_ip}:8181/${mem_api_namespace}",
'url' => "http://${cluster_ip}:${mem_api_port}/${mem_api_namespace}",
},
{
'path' => "/${mem_trace_namespace}",
'url' => "${mem_ws_proto}://${cluster_ip}:8460/${mem_trace_namespace}",
'url' => "${mem_ws_proto}://${cluster_ip}:${mem_trace_port}/${mem_trace_namespace}",
},
{
'path' => "/${mem_analytics_namespace}",
'url' => "${mem_ws_proto}${analytics_ip}:8080/${mem_analytics_namespace}",
'url' => "${mem_ws_proto}${analytics_ip}:${mem_analytics_port}/${mem_analytics_namespace}",
},
]
}
@ -97,11 +100,11 @@ class midonet::mem::vhost (
$proxy_pass = [
{
'path' => "/${mem_api_namespace}",
'url' => "http://${cluster_ip}:8181/${mem_api_namespace}",
'url' => "http://${cluster_ip}:${mem_api_port}/${mem_api_namespace}",
},
{
'path' => "/${mem_trace_namespace}",
'url' => "${mem_ws_proto}://${cluster_ip}:8460/${mem_trace_namespace}",
'url' => "${mem_ws_proto}://${cluster_ip}:${mem_trace_port}/${mem_trace_namespace}",
},
]
}