openstack/charm-neutron-openvswitch
Code Issues Proposed changes

[hopem,r=]

Browse Source 
Charm-helpers sync to get LP 1525845
Partially-Closes-Bug: 1525845
This commit is contained in:
Edward Hope-Morley
2015-12-14 10:49:38 +00:00
parent aaeb8bca28
commit fd8417c43b
22 changed files with 1030 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hooks/charmhelpers/contrib/python/packages.py
View File

@@ -42,8 +42,12 @@ def parse_options(given, available):
yield "--{0}={1}".format(key, value)
def pip_install_requirements(requirements, **options):
"""Install a requirements file """
def pip_install_requirements(requirements, constraints=None, **options):
"""Install a requirements file.
:param constraints: Path to pip constraints file.
http://pip.readthedocs.org/en/stable/user_guide/#constraints-files
"""
command = ["install"]
available_options = ('proxy', 'src', 'log', )
@@ -51,8 +55,13 @@ def pip_install_requirements(requirements, **options):
command.append(option)
command.append("-r {0}".format(requirements))
log("Installing from file: {} with options: {}".format(requirements,
command))
if constraints:
command.append("-c {0}".format(constraints))
log("Installing from file: {} with constraints {} "
"and options: {}".format(requirements, constraints, command))
else:
log("Installing from file: {} with options: {}".format(requirements,
command))
pip_execute(command)