openstack/charm-neutron-gateway
Code Issues Proposed changes

cleanup

Browse Source
This commit is contained in:
Ryan Beisner 2014-12-17 17:34:33 +00:00
parent 556c84afc5
commit d7dfc265d3
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/quantum_hooks.py
View File

@ -61,7 +61,7 @@ def install():
src = 'cloud:precise-folsom' src = 'cloud:precise-folsom'
configure_installation_source(src) configure_installation_source(src)
apt_update(fatal=True) apt_update(fatal=True)
apt_install('python-six', fatal=True) apt_install('python-six', fatal=True) # Force upgrade
if valid_plugin(): if valid_plugin():
apt_install(filter_installed_packages(get_early_packages()), apt_install(filter_installed_packages(get_early_packages()),
fatal=True) fatal=True)

7
hooks/quantum_utils.py
View File

@ -91,7 +91,6 @@ QUANTUM_GATEWAY_PKGS = {
"quantum-dhcp-agent", "quantum-dhcp-agent",
'python-mysqldb', 'python-mysqldb',
'python-psycopg2', 'python-psycopg2',
# "python-six", # Force upgrade
"nova-api-metadata" "nova-api-metadata"
], ],
NVP: [ NVP: [
@ -99,7 +98,6 @@ QUANTUM_GATEWAY_PKGS = {
"quantum-dhcp-agent", "quantum-dhcp-agent",
'python-mysqldb', 'python-mysqldb',
'python-psycopg2', 'python-psycopg2',
# "python-six", # Force upgrade
"nova-api-metadata" "nova-api-metadata"
] ]
} }
@ -113,7 +111,6 @@ NEUTRON_GATEWAY_PKGS = {
'python-mysqldb', 'python-mysqldb',
'python-psycopg2', 'python-psycopg2',
'python-oslo.config', # Force upgrade 'python-oslo.config', # Force upgrade
# "python-six", # Force upgrade
"nova-api-metadata", "nova-api-metadata",
"neutron-plugin-metering-agent", "neutron-plugin-metering-agent",
"neutron-lbaas-agent", "neutron-lbaas-agent",
@ -123,7 +120,6 @@ NEUTRON_GATEWAY_PKGS = {
'python-mysqldb', 'python-mysqldb',
'python-psycopg2', 'python-psycopg2',
'python-oslo.config', # Force upgrade 'python-oslo.config', # Force upgrade
# "python-six", # Force upgrade
"nova-api-metadata" "nova-api-metadata"
], ],
N1KV: [ N1KV: [
@ -131,7 +127,6 @@ NEUTRON_GATEWAY_PKGS = {
"neutron-dhcp-agent", "neutron-dhcp-agent",
"python-mysqldb", "python-mysqldb",
"python-psycopg2", "python-psycopg2",
# "python-six", # Force upgrade
"nova-api-metadata", "nova-api-metadata",
"neutron-common", "neutron-common",
"neutron-l3-agent" "neutron-l3-agent"
@ -157,12 +152,10 @@ def get_early_packages():
pkgs = determine_dkms_package() pkgs = determine_dkms_package()
else: else:
return [] return []
# return ['python-six']
# ensure headers are installed build any required dkms packages # ensure headers are installed build any required dkms packages
if [p for p in pkgs if 'dkms' in p]: if [p for p in pkgs if 'dkms' in p]:
return pkgs + [headers_package()] return pkgs + [headers_package()]
# pkgs.append('python-six')
return pkgs return pkgs