From 09ab2ceeeebefcb7be226263cce00bb21e1b6ebc Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Fri, 26 May 2017 11:52:45 +0100 Subject: [PATCH] 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: Ibd9975c9715d5f3739ed43addb7139367b69fd26 --- tasks/octavia_install.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tasks/octavia_install.yml b/tasks/octavia_install.yml index 41f02d0b..04f66cad 100644 --- a/tasks/octavia_install.yml +++ b/tasks/octavia_install.yml @@ -38,6 +38,7 @@ name: "{{ octavia_requires_pip_packages }}" state: "{{ octavia_pip_package_state }}" extra_args: >- + {{ octavia_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_options | default('') }} register: install_packages @@ -90,7 +91,7 @@ virtualenv: "{{ octavia_bin | dirname }}" virtualenv_site_packages: "no" extra_args: >- - {{ octavia_developer_mode | ternary('--constraint /opt/developer-pip-constraints.txt', '') }} + {{ octavia_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_options | default('') }} register: install_packages