Install lbaas agent pkg only when needed

The lbaas recipe is meant to be run on a controller node, while the
lbaas_agent recipe is for a network node. Installing the lbaas agent
package on a controller leads to a failing service being started.
In order to avoid that, we need to split up the package lists and
install the agent only when it is needed.
Installing the lbaas agent on a controller node instead of a network

Change-Id: I8742e59bf5a07f1e26461e29f3cb2a1267b20925
This commit is contained in:
Jens Harbott
2020-11-05 10:45:14 +01:00
parent 3d2fe2123c
commit 32af875a9d
4 changed files with 15 additions and 4 deletions

View File

@@ -197,6 +197,12 @@ default['openstack']['network']['platform'].tap do |platform|
iproute iproute
openstack-neutron-lbaas openstack-neutron-lbaas
) )
platform['neutron_lbaas_agent_packages'] =
%w(
haproxy
iproute
openstack-neutron-lbaas
)
platform['neutron_lbaas_python_dependencies'] = %w(python-neutron-lbaas) platform['neutron_lbaas_python_dependencies'] = %w(python-neutron-lbaas)
platform['neutron_openvswitch_packages'] = %w(openvswitch) platform['neutron_openvswitch_packages'] = %w(openvswitch)
platform['neutron_openvswitch_agent_packages'] = %w(openstack-neutron-openvswitch iproute) platform['neutron_openvswitch_agent_packages'] = %w(openstack-neutron-openvswitch iproute)
@@ -218,6 +224,12 @@ default['openstack']['network']['platform'].tap do |platform|
radvd radvd
) )
platform['neutron_lbaas_packages'] = platform['neutron_lbaas_packages'] =
%w(
haproxy
neutron-lbaas-common
python3-neutron-lbaas
)
platform['neutron_lbaas_agent_packages'] =
%w( %w(
haproxy haproxy
neutron-lbaas-common neutron-lbaas-common

View File

@@ -3,7 +3,7 @@ maintainer 'openstack-chef'
maintainer_email 'openstack-discuss@lists.openstack.org' maintainer_email 'openstack-discuss@lists.openstack.org'
license 'Apache-2.0' license 'Apache-2.0'
description 'Installs and configures the OpenStack Network API Service and various agents and plugins' description 'Installs and configures the OpenStack Network API Service and various agents and plugins'
version '19.2.0' version '19.2.1'
%w(ubuntu redhat centos).each do |os| %w(ubuntu redhat centos).each do |os|
supports os supports os

View File

@@ -1,7 +1,7 @@
# Encoding: utf-8 # Encoding: utf-8
# #
# Cookbook:: openstack-network # Cookbook:: openstack-network
# Recipe:: lbaas # Recipe:: lbaas_agent
# #
# Copyright:: 2013, Mirantis IT # Copyright:: 2013, Mirantis IT
# Copyright:: 2020, Oregon State University # Copyright:: 2020, Oregon State University
@@ -30,7 +30,7 @@ class ::Chef::Recipe
end end
platform_options = node['openstack']['network']['platform'] platform_options = node['openstack']['network']['platform']
package platform_options['neutron_lbaas_packages'] do package platform_options['neutron_lbaas_agent_packages'] do
options platform_options['package_overrides'] options platform_options['package_overrides']
action :upgrade action :upgrade
end end

View File

@@ -15,7 +15,6 @@ describe 'openstack-network::lbaas' do
%w( %w(
haproxy haproxy
neutron-lbaas-common neutron-lbaas-common
neutron-lbaasv2-agent
python3-neutron-lbaas python3-neutron-lbaas
) )
it do it do