From 85a3fa6a0a07692d2e84fea661a2467582787d7f Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 14 Jun 2018 01:00:45 +0200 Subject: [PATCH] Debian: no fwaas l3 extensions Looks like fwaas extensions are making a bunch of functional tests fail in Debian, probably because of issues in neutron-rpc-server. We disable it here, at least temporarily, and for Debian only, so that we have a working tempest run for Debian. This may be reverted later on once a better solution is found. Change-Id: I723bb97310dfb2a737ddcdb79caa2a02ef4e211b --- manifests/neutron.pp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 471fdf8fc..9f90842ef 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -207,10 +207,17 @@ class openstack_integration::neutron ( interface_driver => $driver, debug => true, } - class { '::neutron::agents::l3': - interface_driver => $driver, - debug => true, - extensions => 'fwaas', + if ($::os_package_type == 'debian') { + class { '::neutron::agents::l3': + interface_driver => $driver, + debug => true, + } + } else { + class { '::neutron::agents::l3': + interface_driver => $driver, + debug => true, + extensions => 'fwaas', + } } class { '::neutron::agents::dhcp': interface_driver => $driver,