diff --git a/attributes/default.rb b/attributes/default.rb index bb8ce659..9f21ee8a 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -665,6 +665,7 @@ when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this "postgresql_python_packages" => ["python-psycopg2"], "nova_network_packages" => [ "openstack-nova-network" ], "quantum_packages" => [ "openstack-quantum" ], + "quantum_client_packages" => [], "quantum_dhcp_packages" => [ "openstack-quantum" ], "quantum_dhcp_build_packages" => [], "quantum_l3_packages" => [ "quantum-l3-agent" ], @@ -689,6 +690,7 @@ when "suse" "postgresql_python_packages" => ["python-psycopg2"], "nova_network_packages" => ["openstack-nova-network"], "quantum_packages" => ["openstack-quantum"], + "quantum_client_packages" => [], "quantum_dhcp_packages" => ["openstack-quantum-dhcp-agent"], "quantum_dhcp_build_packages" => [], "quantum_l3_packages" => ["openstack-quantum-l3-agent"], @@ -714,7 +716,8 @@ when "ubuntu" "postgresql_python_packages" => [ "python-psycopg2" ], "nova_network_packages" => [ "nova-network" ], "quantum_lb_packages" => ["quantum-lbaas-agent", "haproxy"], - "quantum_packages" => [ "quantum-common", "python-quantumclient", "python-pyparsing", "python-cliff" ], + "quantum_packages" => [ "quantum-common", "python-pyparsing", "python-cliff" ], + "quantum_client_packages" => [ "python-quantumclient" ], "quantum_dhcp_packages" => [ "quantum-dhcp-agent" ], "quantum_dhcp_build_packages" => [ "build-essential", "pkg-config", "libidn11-dev", "libdbus-1-dev", "libnetfilter-conntrack-dev", "gettext" ], "quantum_l3_packages" => [ "quantum-l3-agent" ], diff --git a/recipes/common.rb b/recipes/common.rb index f68c1506..235cb9f4 100644 --- a/recipes/common.rb +++ b/recipes/common.rb @@ -128,10 +128,12 @@ else end # https://bugs.launchpad.net/neutron/+bug/1111572 -package platform_options["quantum_python_package"] do - action :install - options platform_options["package_overrides"] - notifies :upgrade, "python_pip[python-quantumclient]", :immediately +platform_options["quantum_client_packages"].each do |pkg| + package pkg do + action :install + options platform_options["package_overrides"] + notifies :upgrade, "python_pip[python-quantumclient]", :immediately + end end if platform?("ubuntu", "debian") include_recipe "python::pip"