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:
@@ -197,6 +197,12 @@ default['openstack']['network']['platform'].tap do |platform|
|
||||
iproute
|
||||
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_openvswitch_packages'] = %w(openvswitch)
|
||||
platform['neutron_openvswitch_agent_packages'] = %w(openstack-neutron-openvswitch iproute)
|
||||
@@ -218,6 +224,12 @@ default['openstack']['network']['platform'].tap do |platform|
|
||||
radvd
|
||||
)
|
||||
platform['neutron_lbaas_packages'] =
|
||||
%w(
|
||||
haproxy
|
||||
neutron-lbaas-common
|
||||
python3-neutron-lbaas
|
||||
)
|
||||
platform['neutron_lbaas_agent_packages'] =
|
||||
%w(
|
||||
haproxy
|
||||
neutron-lbaas-common
|
||||
|
||||
@@ -3,7 +3,7 @@ maintainer 'openstack-chef'
|
||||
maintainer_email 'openstack-discuss@lists.openstack.org'
|
||||
license 'Apache-2.0'
|
||||
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|
|
||||
supports os
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# Encoding: utf-8
|
||||
#
|
||||
# Cookbook:: openstack-network
|
||||
# Recipe:: lbaas
|
||||
# Recipe:: lbaas_agent
|
||||
#
|
||||
# Copyright:: 2013, Mirantis IT
|
||||
# Copyright:: 2020, Oregon State University
|
||||
@@ -30,7 +30,7 @@ class ::Chef::Recipe
|
||||
end
|
||||
|
||||
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']
|
||||
action :upgrade
|
||||
end
|
||||
|
||||
@@ -15,7 +15,6 @@ describe 'openstack-network::lbaas' do
|
||||
%w(
|
||||
haproxy
|
||||
neutron-lbaas-common
|
||||
neutron-lbaasv2-agent
|
||||
python3-neutron-lbaas
|
||||
)
|
||||
it do
|
||||
|
||||
Reference in New Issue
Block a user