Fix fwaas installation under Ubuntu

In earlier releases python-neutron-fwaas was pulled in as a dependency
of neutron-common automatically, now we need to install that package
explicitly.

Note that this requires the fwaas recipe to be executed also on the
controllers, while previously it only needed to be run on the network
nodes.

Change-Id: I84659e62ae110d79eb486eef7f86869584aba4ee
This commit is contained in:
Jens Harbott 2019-08-12 08:57:56 +00:00
parent d7177f09e6
commit 65e4f8512f
2 changed files with 13 additions and 2 deletions

View File

@ -198,7 +198,8 @@ default['openstack']['network']['platform'].tap do |platform|
%w(openstack-neutron iproute radvd keepalived)
platform['neutron_plugin_package'] =
'neutron-plugin-ml2'
# openstack-neutron-fwaas
platform['neutron_fwaas_packages'] =
%w()
platform['neutron_lbaas_packages'] =
%w(openstack-neutron-lbaas haproxy iproute)
platform['neutron_openvswitch_packages'] =
@ -228,7 +229,8 @@ default['openstack']['network']['platform'].tap do |platform|
%w(neutron-dhcp-agent)
platform['neutron_l3_packages'] =
%w(neutron-l3-agent radvd keepalived)
# python-neutron-fwaas
platform['neutron_fwaas_packages'] =
%w(python-neutron-fwaas)
platform['neutron_lbaas_packages'] =
%w(python-neutron-lbaas neutron-lbaas-common neutron-lbaasv2-agent haproxy)
platform['neutron_openvswitch_packages'] =

View File

@ -22,6 +22,15 @@ class ::Chef::Recipe
include ::Openstack
end
platform_options = node['openstack']['network']['platform']
platform_options['neutron_fwaas_packages'].each do |pkg|
package pkg do
options platform_options['package_overrides']
action :upgrade
end
end
node.default['openstack']['network_fwaas']['conf'].tap do |conf|
conf['fwaas']['enabled'] = true
end