x
/
fuel-plugin-contrail
Code Issues Proposed changes

Port number for Contrail API on Public VIP added to plugin settings 

Change-Id: I4d18a06d1f5db0b52e123163cffda6346917ec19
Related-bug: #1583863
This commit is contained in:
Oleksandr Martsyniuk 2016-05-26 13:30:10 +03:00
parent edb732e438
commit 6f0daae52f
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment_scripts/puppet/modules/contrail/manifests/init.pp
View File

@ -49,7 +49,7 @@ class contrail {
$contrail_private_vip = $network_metadata['vips']['contrail_priv']['ipaddr']
$contrail_mgmt_vip = $contrail_private_vip
$contrail_api_public = $settings['contrail_api_public']
$contrail_api_public_port = $settings['contrail_api_public_port']
# Public SSL for Contrail WebUI
$public_ssl_hash = hiera_hash('public_ssl', {})

20
deployment_scripts/puppet/modules/contrail/manifests/vip.pp
View File

@ -28,7 +28,7 @@ class contrail::vip {
}
openstack::ha::haproxy_service { 'contrail-analytics-api':
order => '201',
order => '200',
listen_port => 8081,
balancermember_port => 9081,
server_names => $contrail::contrail_config_ips,
@ -45,13 +45,27 @@ class contrail::vip {
}
openstack::ha::haproxy_service { 'contrail-configuration-api':
order => '202',
order => '201',
listen_port => 8082,
balancermember_port => 9100,
server_names => $contrail::contrail_config_ips,
ipaddresses => $contrail::contrail_config_ips,
public => $contrail::contrail_api_public,
public => false,
internal => true,
haproxy_config_options => { 'option' => 'nolinger',
'balance' => 'roundrobin',
'timeout' => ['server 3m', 'client 3m'] },
balancermember_options => 'check inter 2000 rise 2 fall 3',
}
openstack::ha::haproxy_service { 'contrail-configuration-api-public':
order => '202',
listen_port => $contrail::contrail_api_public_port,
balancermember_port => 9100,
server_names => $contrail::contrail_config_ips,
ipaddresses => $contrail::contrail_config_ips,
public => true,
internal => false,
public_ssl => $contrail::public_ssl,
public_ssl_path => $contrail::public_ssl_path,
haproxy_config_options => { 'option' => 'nolinger',

13
environment_config.yaml
View File

@ -40,12 +40,15 @@ attributes:
regex:
source: '^(?:(6553[0-5])|(655[0-2]\d)|(65[0-4]\d{2})|(6[0-4]\d{3})|([1-5]\d{4})|([1-9]\d{1,3})|([1-9]))$'
error: "Invalid target"
contrail_api_public:
value: true
label: "Contrail API on Public VIP"
description: "Toggles Contrail API endpoint for Public VIP. Enabling this option is incompatible with Murano, as it uses the same port, 8082"
contrail_api_public_port:
value: "8082"
label: "Listen port for Contrail API on Public VIP"
description: "The listen port for Contrail API endpoint for Public VIP. Default value 8082 may not be used if Murano is installed, as it uses the same port"
weight: 62
type: "checkbox"
type: "text"
regex:
source: '^(6553[0-5]|655[0-2]\d|65[0-4]\d{2}|6[0-4]\d{3}|5\d{4}|[0-9]\d{0,3})$'
error: "Invalid port"
contrail_global_dpdk:
value: false
label: "Enable DPDK feature for this environment."