Allow the developer constraints to be adjusted

In order to do a developer mode that allows installation of packages
from local file, which take precedence over the developer_mode
constraints, we need to allow the order of the constraints to be changed.

This patch adds a "pip_install_developer_constraints" var which is used
to set the developer mode constraints. By default this will leave the
same behaviour but will allow additional constraints to be added, or the
developermode constraints file to be overriden altogether.

Change-Id: Iad94ffc7c3dd96a585b94d58ed8997f13d765f0d
This commit is contained in:
Andy McCrae 2017-05-26 11:01:30 +01:00
parent 12ba6009f9
commit 5e6440cb0b

View File

@ -39,6 +39,7 @@
name: "{{ glance_requires_pip_packages }}" name: "{{ glance_requires_pip_packages }}"
state: "{{ glance_pip_package_state }}" state: "{{ glance_pip_package_state }}"
extra_args: >- extra_args: >-
{{ glance_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }} {{ pip_install_options | default('') }}
register: install_packages register: install_packages
@ -90,7 +91,7 @@
virtualenv: "{{ glance_bin | dirname }}" virtualenv: "{{ glance_bin | dirname }}"
virtualenv_site_packages: "no" virtualenv_site_packages: "no"
extra_args: >- extra_args: >-
{{ glance_developer_mode | ternary('--constraint /opt/developer-pip-constraints.txt', '') }} {{ glance_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }} {{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }} {{ pip_install_options | default('') }}
register: install_packages register: install_packages