openstack/puppet-openstack-integration
Code Issues Proposed changes

Revert "Debian: no fwaas l3 extensions"

Browse Source 
After upstream code has been fixed to work with neutron-api and
neutron-rpc-server, and after this patch has been merged into the Debian
package, we can finally re-activate FWaaS in Debian.

This reverts commit 85a3fa6a0a07692d2e84fea661a2467582787d7f.

Change-Id: Idd94928567677cc46779a8261b436a96a35050e3
This commit is contained in:
Thomas Goirand 2018-06-21 21:34:44 +02:00
parent 186b41320b
commit 5cdee0055d
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/neutron.pp
View File

@ -207,18 +207,11 @@ class openstack_integration::neutron (
interface_driver => $driver, interface_driver => $driver,
debug => true, debug => true,
} }
if ($::os_package_type == 'debian') {
class { '::neutron::agents::l3':
interface_driver => $driver,
debug => true,
}
} else {
class { '::neutron::agents::l3': class { '::neutron::agents::l3':
interface_driver => $driver, interface_driver => $driver,
debug => true, debug => true,
extensions => 'fwaas', extensions => 'fwaas',
} }
}
class { '::neutron::agents::dhcp': class { '::neutron::agents::dhcp':
interface_driver => $driver, interface_driver => $driver,
debug => true, debug => true,