Fix LBaaSv2 deployment
Review https://review.openstack.org/#/c/374229/ fixed some issues for lbaasv2 but some more changes are needed to make it work properly. Change-Id: Ia727748498c81cf0e5c1e9fe1afd771ed0c44767
This commit is contained in:
parent
a7bf90f5c0
commit
2eb64f1488
|
@ -600,8 +600,11 @@ def create_manifests(config, messages):
|
||||||
service_plugins = []
|
service_plugins = []
|
||||||
service_providers = []
|
service_providers = []
|
||||||
if config['CONFIG_LBAAS_INSTALL'] == 'y':
|
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.'
|
lbaas_sp = ('LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.'
|
||||||
'plugin_driver.HaproxyOnHostPluginDriver')
|
'plugin_driver.HaproxyOnHostPluginDriver:default')
|
||||||
service_providers.append(lbaas_sp)
|
service_providers.append(lbaas_sp)
|
||||||
|
|
||||||
# ML2 uses the L3 Router service plugin to implement l3 agent
|
# ML2 uses the L3 Router service plugin to implement l3 agent
|
||||||
|
|
|
@ -34,7 +34,6 @@ class packstack::horizon ()
|
||||||
horizon_key => hiera('CONFIG_HORIZON_SSL_KEY', undef),
|
horizon_key => hiera('CONFIG_HORIZON_SSL_KEY', undef),
|
||||||
horizon_ca => hiera('CONFIG_HORIZON_SSL_CACERT', undef),
|
horizon_ca => hiera('CONFIG_HORIZON_SSL_CACERT', undef),
|
||||||
neutron_options => {
|
neutron_options => {
|
||||||
'enable_lb' => hiera('CONFIG_HORIZON_NEUTRON_LB'),
|
|
||||||
'enable_firewall' => hiera('CONFIG_HORIZON_NEUTRON_FW'),
|
'enable_firewall' => hiera('CONFIG_HORIZON_NEUTRON_FW'),
|
||||||
'enable_vpn' => hiera('CONFIG_HORIZON_NEUTRON_VPN'),
|
'enable_vpn' => hiera('CONFIG_HORIZON_NEUTRON_VPN'),
|
||||||
},
|
},
|
||||||
|
|
|
@ -10,6 +10,7 @@ class packstack::neutron::api ()
|
||||||
$neutron_user_password = hiera('CONFIG_NEUTRON_KS_PW')
|
$neutron_user_password = hiera('CONFIG_NEUTRON_KS_PW')
|
||||||
$neutron_fwaas_enabled = str2bool(hiera('CONFIG_NEUTRON_FWAAS'))
|
$neutron_fwaas_enabled = str2bool(hiera('CONFIG_NEUTRON_FWAAS'))
|
||||||
$neutron_vpnaas_enabled = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
|
$neutron_vpnaas_enabled = str2bool(hiera('CONFIG_NEUTRON_VPNAAS'))
|
||||||
|
$neutron_lbaas_enabled = str2bool(hiera('CONFIG_LBAAS_INSTALL'))
|
||||||
|
|
||||||
class { '::neutron::server':
|
class { '::neutron::server':
|
||||||
database_connection => $neutron_sql_connection,
|
database_connection => $neutron_sql_connection,
|
||||||
|
@ -30,5 +31,9 @@ class packstack::neutron::api ()
|
||||||
mode => '0640',
|
mode => '0640',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if $neutron_lbaas_enabled {
|
||||||
|
class { '::neutron::services::lbaas': }
|
||||||
|
}
|
||||||
|
|
||||||
Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']
|
Class['::neutron::server'] -> File['/etc/neutron/api-paste.ini']
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,8 +8,4 @@ class packstack::neutron::lbaas ()
|
||||||
enable_v2 => true,
|
enable_v2 => true,
|
||||||
debug => hiera('CONFIG_DEBUG_MODE'),
|
debug => hiera('CONFIG_DEBUG_MODE'),
|
||||||
}
|
}
|
||||||
|
|
||||||
class {'::neutron::services::lbaas':
|
|
||||||
service_providers => 'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver',
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue