Simplify pip options/constraints mechanism

The current constraints generation for the
installation involves multiple tasks and multiple
variables.

Using multiple tasks extends the installation time
unnecessarily and the additional variables are
unnecessary.

This patch aims to simplify the mechanism and
hopes to speed it up a little.

Change-Id: Iddaddadffc2e3353db49098ff22e68fa6b0a3d16
This commit is contained in:
Jesse Pretorius 2016-11-02 12:45:51 +00:00
parent b0c086e3ed
commit 9301342903
3 changed files with 15 additions and 28 deletions

View File

@ -29,8 +29,6 @@ heat_pip_package_state: "latest"
heat_git_repo: https://git.openstack.org/openstack/heat
heat_git_install_branch: master
heat_requirements_git_repo: https://git.openstack.org/openstack/requirements
heat_requirements_git_install_branch: master
heat_developer_mode: false
heat_developer_constraints:
- "git+{{ heat_git_repo }}@{{ heat_git_install_branch }}#egg=heat"

View File

@ -0,0 +1,7 @@
---
upgrade:
- The variables ``heat_requirements_git_repo`` and
``heat_requirements_git_install_branch`` have been
removed in favour of using the URL/path to the
upper-constraints file using the
variable ``pip_install_upper_constraints`` instead.

View File

@ -25,36 +25,15 @@
{% for item in heat_developer_constraints %}
{{ item }}
{% endfor %}
when:
- heat_developer_mode | bool
- name: Clone requirements git repository
git:
repo: "{{ heat_requirements_git_repo }}"
dest: "/opt/requirements"
clone: yes
update: yes
version: "{{ heat_requirements_git_install_branch }}"
when:
- heat_developer_mode | bool
- name: Add constraints to pip_install_options fact for developer mode
set_fact:
pip_install_options_fact: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt"
when:
- heat_developer_mode | bool
- name: Set pip_install_options_fact when not in developer mode
set_fact:
pip_install_options_fact: "{{ pip_install_options|default('') }}"
when:
- not heat_developer_mode | bool
when: heat_developer_mode | bool
- name: Install requires pip packages
pip:
name: "{{ heat_requires_pip_packages | join(' ') }}"
state: "{{ heat_pip_package_state }}"
extra_args: "{{ pip_install_options_fact }}"
extra_args: >-
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }}
register: install_packages
until: install_packages|success
retries: 5
@ -126,7 +105,10 @@
state: "{{ heat_pip_package_state }}"
virtualenv: "{{ heat_bin | dirname }}"
virtualenv_site_packages: "no"
extra_args: "{{ pip_install_options_fact }}"
extra_args: >-
{{ keystone_developer_mode | ternary('--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
until: install_packages|success
retries: 5