openstack/puppet-openstack-integration
Code Issues Proposed changes

Remove FWaaS deployment

Browse Source 
FWaaS is being retired upstream during Victoria release, so we need to
remove it.

[1] https://review.opendev.org/#/c/735829/

Change-Id: I2a8fe7352ea0a6c99ac29455f86eedccff7c9772
This commit is contained in:
Alfredo Moralejo 2020-06-18 15:37:52 +02:00
parent 7e40c8c875
commit 9844517f23
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/neutron.pp
View File

@ -122,16 +122,16 @@ class openstack_integration::neutron (
if $l2gw_enabled { if $l2gw_enabled {
if ($::operatingsystem == 'Ubuntu') { if ($::operatingsystem == 'Ubuntu') {
class {'neutron::services::l2gw': } class {'neutron::services::l2gw': }
$l2gw_provider = 'L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default' $providers_list = ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default']
} }
elsif ($::operatingsystem != 'Ubuntu') { elsif ($::operatingsystem != 'Ubuntu') {
class {'neutron::services::l2gw': class {'neutron::services::l2gw':
service_providers => ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default'] service_providers => ['L2GW:l2gw:networking_l2gw.services.l2gateway.service_drivers.L2gwDriver:default']
} }
$l2gw_provider = undef $providers_list = undef
} }
} else { } else {
$l2gw_provider = undef $providers_list = undef
} }
$l2gw_plugin = $l2gw_enabled ? { $l2gw_plugin = $l2gw_enabled ? {
true => 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin', true => 'networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin',
@ -141,7 +141,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', 'qos', 'trunk', $bgpvpn_plugin, $l2gw_plugin, $bgp_dr_plugin]) $plugins_list = delete_undef_values(['router', 'metering', 'qos', 'trunk', $bgpvpn_plugin, $l2gw_plugin, $bgp_dr_plugin])
if $driver == 'linuxbridge' { if $driver == 'linuxbridge' {
$global_physnet_mtu = '1450' $global_physnet_mtu = '1450'
@ -189,8 +189,6 @@ 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(['FIREWALL_V2:fwaas_db:neutron_fwaas.services.firewall.service_drivers.agents.agents.FirewallAgentDriver:default',
$l2gw_provider])
if $::osfamily == 'Debian' { if $::osfamily == 'Debian' {
Service<| title == 'neutron-server'|> -> Openstacklib::Service_validation<| title == 'neutron-server' |> -> Neutron_network<||> Service<| title == 'neutron-server'|> -> Openstacklib::Service_validation<| title == 'neutron-server' |> -> Neutron_network<||>
@ -238,7 +236,6 @@ class openstack_integration::neutron (
class { 'neutron::agents::l3': class { 'neutron::agents::l3':
interface_driver => $driver, interface_driver => $driver,
debug => true, debug => true,
extensions => 'fwaas_v2',
} }
class { 'neutron::agents::dhcp': class { 'neutron::agents::dhcp':
interface_driver => $driver, interface_driver => $driver,
@ -252,12 +249,6 @@ class openstack_integration::neutron (
auth_url => $::openstack_integration::config::keystone_admin_uri, auth_url => $::openstack_integration::config::keystone_admin_uri,
password => 'a_big_secret', password => 'a_big_secret',
} }
class { 'neutron::services::fwaas':
enabled => true,
agent_version => 'v2',
driver => 'neutron_fwaas.services.firewall.service_drivers.agents.drivers.linux.iptables_fwaas_v2.IptablesFwaasDriver',
}
if $bgpvpn_enabled { if $bgpvpn_enabled {
class {'neutron::services::bgpvpn': class {'neutron::services::bgpvpn':
service_providers => 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default' service_providers => 'BGPVPN:Dummy:networking_bgpvpn.neutron.services.service_drivers.driver_api.BGPVPNDriver:default'

1
manifests/tempest.pp
View File

@ -235,7 +235,6 @@ class openstack_integration::tempest (
neutron_bgpvpn_available => $bgpvpn, neutron_bgpvpn_available => $bgpvpn,
neutron_l2gw_available => $l2gw, neutron_l2gw_available => $l2gw,
neutron_dr_available => $dr, neutron_dr_available => $dr,
neutron_fwaas_available => true,
ceilometer_available => $ceilometer, ceilometer_available => $ceilometer,
aodh_available => $aodh, aodh_available => $aodh,
trove_available => $trove, trove_available => $trove,