openstack/openstack-ansible-os_cloudkitty
Code Issues Proposed changes

Allow the developer constraints to be adjusted

Browse Source 
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.

Additionally, fix bug where incorrect "keystone_developer_mode" variable
was used in cloudkitty role.

Change-Id: Ic28a42d4475e9334567d155ba182e15c7a829d4d
This commit is contained in:
Andy McCrae 2017-05-26 10:57:46 +01:00
parent 92c226ba7f
commit e0e1c504f4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasks/cloudkitty_install.yml
View File

@ -43,6 +43,7 @@
name: "{{ cloudkitty_requires_pip_packages }}"
state: "{{ cloudkitty_pip_package_state }}"
extra_args: >-
{{ cloudkitty_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
@ -112,7 +113,7 @@
virtualenv: "{{ cloudkitty_bin | dirname }}"
virtualenv_site_packages: "no"
extra_args: >-
{{ keystone_developer_mode | ternary('--constraint /opt/developer-pip-constraints.txt', '') }}
{{ cloudkitty_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