force six install directly in the install hook
This commit is contained in:
parent
3610c7d684
commit
556c84afc5
@ -61,6 +61,7 @@ def install():
|
||||
src = 'cloud:precise-folsom'
|
||||
configure_installation_source(src)
|
||||
apt_update(fatal=True)
|
||||
apt_install('python-six', fatal=True)
|
||||
if valid_plugin():
|
||||
apt_install(filter_installed_packages(get_early_packages()),
|
||||
fatal=True)
|
||||
|
@ -156,12 +156,13 @@ def get_early_packages():
|
||||
if config('plugin') in [OVS]:
|
||||
pkgs = determine_dkms_package()
|
||||
else:
|
||||
return ['python-six']
|
||||
return []
|
||||
# return ['python-six']
|
||||
|
||||
# ensure headers are installed build any required dkms packages
|
||||
if [p for p in pkgs if 'dkms' in p]:
|
||||
return pkgs + [headers_package()]
|
||||
pkgs.append('python-six')
|
||||
# pkgs.append('python-six')
|
||||
return pkgs
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user