x/packstack
Code Issues Proposed changes

Merge "Fix LBaaSv2 deployment" into stable/newton

Browse Source
This commit is contained in:
Jenkins 2016-10-06 18:38:49 +00:00 committed by Gerrit Code Review
commit 40d7b4cf20
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packstack/plugins/neutron_350.py
View File

@ -600,8 +600,11 @@ def create_manifests(config, messages):
service_plugins = []
service_providers = []
if config['CONFIG_LBAAS_INSTALL'] == 'y':
lbaas_plugin = ('neutron_lbaas.services.loadbalancer.plugin.'
'LoadBalancerPluginv2')
service_plugins.append(lbaas_plugin)
lbaas_sp = ('LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.'
'plugin_driver.HaproxyOnHostPluginDriver')
'plugin_driver.HaproxyOnHostPluginDriver:default')
service_providers.append(lbaas_sp)
# ML2 uses the L3 Router service plugin to implement l3 agent

1
packstack/puppet/modules/packstack/manifests/horizon.pp
View File

@ -34,7 +34,6 @@ class packstack::horizon ()
horizon_key => hiera('CONFIG_HORIZON_SSL_KEY', undef),
horizon_ca => hiera('CONFIG_HORIZON_SSL_CACERT', undef),
neutron_options => {
'enable_lb' => hiera('CONFIG_HORIZON_NEUTRON_LB'),
'enable_firewall' => hiera('CONFIG_HORIZON_NEUTRON_FW'),
'enable_vpn' => hiera('CONFIG_HORIZON_NEUTRON_VPN'),
},

5
packstack/puppet/modules/packstack/manifests/neutron/api.pp
View File

@ -10,6 +10,7 @@ class packstack::neutron::api ()
$neutron_user_password = hiera('CONFIG_NEUTRON_KS_PW')
$neutron_fwaas_enabled = str2bool(hiera('CONFIG_NEUTRON_FWAAS'))
$neutron_vpnaas_enabled = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
$neutron_lbaas_enabled = str2bool(hiera('CONFIG_LBAAS_INSTALL'))
class { '::neutron::server':
database_connection => $neutron_sql_connection,
@ -30,5 +31,9 @@ class packstack::neutron::api ()
mode => '0640',
}
if $neutron_lbaas_enabled {
class { '::neutron::services::lbaas': }
}
Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']
}

4
packstack/puppet/modules/packstack/manifests/neutron/lbaas.pp
View File

@ -8,8 +8,4 @@ class packstack::neutron::lbaas ()
enable_v2 => true,
debug => hiera('CONFIG_DEBUG_MODE'),
}
class {'::neutron::services::lbaas':
service_providers => 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver',
}
}