diff --git a/attributes/default.rb b/attributes/default.rb index bb2f163e..5fd16dc2 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -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 diff --git a/metadata.rb b/metadata.rb index 311031d7..b975d0d6 100644 --- a/metadata.rb +++ b/metadata.rb @@ -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 diff --git a/recipes/lbaas_agent.rb b/recipes/lbaas_agent.rb index c0af78a0..9524d3cc 100644 --- a/recipes/lbaas_agent.rb +++ b/recipes/lbaas_agent.rb @@ -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 diff --git a/spec/lbaas_spec.rb b/spec/lbaas_spec.rb index 0b4d74b8..93e49d9d 100644 --- a/spec/lbaas_spec.rb +++ b/spec/lbaas_spec.rb @@ -15,7 +15,6 @@ describe 'openstack-network::lbaas' do %w( haproxy neutron-lbaas-common - neutron-lbaasv2-agent python3-neutron-lbaas ) it do