openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Remove Neutron LBaaS"

Browse Source
This commit is contained in:
Zuul 2019-06-04 22:12:43 +00:00 committed by Gerrit Code Review
commit 348304f48c
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -46,7 +46,6 @@ scenario](#all-in-one).
| glance | rbd | swift | file | swift+rgw | file | | glance | rbd | swift | file | swift+rgw | file |
| nova | rbd | X | X | rbd | X | | nova | rbd | X | X | rbd | X |
| neutron | ovs | ovs | linuxbridge | ovs | ovs | | neutron | ovs | ovs | linuxbridge | ovs | ovs |
| lbaas | v2 | v2 | v2 | | v2 |
| cinder | rbd | iscsi | | | iscsi | | cinder | rbd | iscsi | | | iscsi |
| ceilometer | X | | | | | | ceilometer | X | | | | |
| aodh | X | | | | | | aodh | X | | | | |

11
manifests/neutron.pp
View File

@ -133,7 +133,7 @@ class openstack_integration::neutron (
true => 'neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin', true => 'neutron_dynamic_routing.services.bgp.bgp_plugin.BgpPlugin',
default => undef, default => undef,
} }
$plugins_list = delete_undef_values(['router', 'metering', 'firewall_v2', 'lbaasv2', 'qos', 'trunk', $bgpvpn_plugin, $l2gw_plugin, $bgp_dr_plugin]) $plugins_list = delete_undef_values(['router', 'metering', 'firewall_v2', 'qos', 'trunk', $bgpvpn_plugin, $l2gw_plugin, $bgp_dr_plugin])
if $driver == 'linuxbridge' { if $driver == 'linuxbridge' {
$global_physnet_mtu = '1450' $global_physnet_mtu = '1450'
@ -181,9 +181,7 @@ class openstack_integration::neutron (
www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri, www_authenticate_uri => $::openstack_integration::config::keystone_auth_uri,
memcached_servers => $::openstack_integration::config::memcached_servers, memcached_servers => $::openstack_integration::config::memcached_servers,
} }
$providers_list = delete_undef_values(['LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default', $providers_list = delete_undef_values(['FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default',
'LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default',
'FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default',
$l2gw_provider]) $l2gw_provider])
if $::osfamily == 'Debian' { if $::osfamily == 'Debian' {
@ -203,7 +201,6 @@ class openstack_integration::neutron (
ensure_dr_package => $bgp_dragent_enabled, ensure_dr_package => $bgp_dragent_enabled,
} }
class { '::neutron::services::lbaas': }
class { '::neutron::plugins::ml2': class { '::neutron::plugins::ml2':
type_drivers => ['vxlan', 'vlan', 'flat'], type_drivers => ['vxlan', 'vlan', 'flat'],
tenant_network_types => ['vxlan', 'vlan', 'flat'], tenant_network_types => ['vxlan', 'vlan', 'flat'],
@ -230,10 +227,6 @@ class openstack_integration::neutron (
metadata_host => $metadata_host, metadata_host => $metadata_host,
metadata_protocol => $metadata_protocol, metadata_protocol => $metadata_protocol,
} }
class { '::neutron::agents::lbaas':
interface_driver => $driver,
debug => true,
}
class { '::neutron::agents::l3': class { '::neutron::agents::l3':
interface_driver => $driver, interface_driver => $driver,
debug => true, debug => true,

1
manifests/tempest.pp
View File

@ -228,7 +228,6 @@ class openstack_integration::tempest (
nova_available => $nova, nova_available => $nova,
neutron_available => $neutron, neutron_available => $neutron,
neutron_bgpvpn_available => $bgpvpn, neutron_bgpvpn_available => $bgpvpn,
neutron_lbaas_available => true,
neutron_l2gw_available => $l2gw, neutron_l2gw_available => $l2gw,
neutron_dr_available => $dr, neutron_dr_available => $dr,
neutron_fwaas_available => true, neutron_fwaas_available => true,