openstack/cookbook-openstack-network
Code Issues Proposed changes

Bug fix python-quantumclient installation

Browse Source 
On ubuntu and debian, we install the latest quantum
python client using pip since the upstream package
for quantum-pythonclient is broken and has been for
some time.  This fixes the code that was supposed
to do that.

Change-Id: I84535b6a350ea8c8a35ebd0ea60cca4587972806
This commit is contained in:
Alan Meadows
2013-08-07 16:34:43 +00:00
parent 1721e6c9e9
commit b4bfd38efe
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
attributes/default.rb
View File

@@ -665,6 +665,7 @@ when "fedora", "redhat", "centos" # :pragma-foodcritic: ~FC024 - won't fix this
"postgresql_python_packages" => ["python-psycopg2"], "postgresql_python_packages" => ["python-psycopg2"],
"nova_network_packages" => [ "openstack-nova-network" ], "nova_network_packages" => [ "openstack-nova-network" ],
"quantum_packages" => [ "openstack-quantum" ], "quantum_packages" => [ "openstack-quantum" ],
"quantum_client_packages" => [],
"quantum_dhcp_packages" => [ "openstack-quantum" ], "quantum_dhcp_packages" => [ "openstack-quantum" ],
"quantum_dhcp_build_packages" => [], "quantum_dhcp_build_packages" => [],
"quantum_l3_packages" => [ "quantum-l3-agent" ], "quantum_l3_packages" => [ "quantum-l3-agent" ],
@@ -689,6 +690,7 @@ when "suse"
"postgresql_python_packages" => ["python-psycopg2"], "postgresql_python_packages" => ["python-psycopg2"],
"nova_network_packages" => ["openstack-nova-network"], "nova_network_packages" => ["openstack-nova-network"],
"quantum_packages" => ["openstack-quantum"], "quantum_packages" => ["openstack-quantum"],
"quantum_client_packages" => [],
"quantum_dhcp_packages" => ["openstack-quantum-dhcp-agent"], "quantum_dhcp_packages" => ["openstack-quantum-dhcp-agent"],
"quantum_dhcp_build_packages" => [], "quantum_dhcp_build_packages" => [],
"quantum_l3_packages" => ["openstack-quantum-l3-agent"], "quantum_l3_packages" => ["openstack-quantum-l3-agent"],
@@ -714,7 +716,8 @@ when "ubuntu"
"postgresql_python_packages" => [ "python-psycopg2" ], "postgresql_python_packages" => [ "python-psycopg2" ],
"nova_network_packages" => [ "nova-network" ], "nova_network_packages" => [ "nova-network" ],
"quantum_lb_packages" => ["quantum-lbaas-agent", "haproxy"], "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_packages" => [ "quantum-dhcp-agent" ],
"quantum_dhcp_build_packages" => [ "build-essential", "pkg-config", "libidn11-dev", "libdbus-1-dev", "libnetfilter-conntrack-dev", "gettext" ], "quantum_dhcp_build_packages" => [ "build-essential", "pkg-config", "libidn11-dev", "libdbus-1-dev", "libnetfilter-conntrack-dev", "gettext" ],
"quantum_l3_packages" => [ "quantum-l3-agent" ], "quantum_l3_packages" => [ "quantum-l3-agent" ],

10
recipes/common.rb
View File

@@ -128,10 +128,12 @@ else
end end
# https://bugs.launchpad.net/neutron/+bug/1111572 # https://bugs.launchpad.net/neutron/+bug/1111572
package platform_options["quantum_python_package"] do platform_options["quantum_client_packages"].each do |pkg|
action :install package pkg do
options platform_options["package_overrides"] action :install
notifies :upgrade, "python_pip[python-quantumclient]", :immediately options platform_options["package_overrides"]
notifies :upgrade, "python_pip[python-quantumclient]", :immediately
end
end end
if platform?("ubuntu", "debian") if platform?("ubuntu", "debian")
include_recipe "python::pip" include_recipe "python::pip"