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: Ie860ef9bc223621140205d465298c4009b86118a
This commit is contained in:
Jesse Pretorius 2016-11-02 13:22:16 +00:00
parent 42b3436ab9
commit 47b5a171ca
3 changed files with 15 additions and 28 deletions

View File

@ -28,8 +28,6 @@ ironic_pip_package_state: "latest"
# of an OpenStack-Ansible repo_server.
ironic_git_repo: https://git.openstack.org/openstack/ironic
ironic_git_install_branch: master
ironic_requirements_git_repo: https://git.openstack.org/openstack/requirements
ironic_requirements_git_install_branch: master
ironic_developer_mode: false
ironic_developer_constraints:
- "git+{{ ironic_git_repo }}@{{ ironic_git_install_branch }}#egg=ironic"

View File

@ -0,0 +1,7 @@
---
upgrade:
- The variables ``ironic_requirements_git_repo`` and
``ironic_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

@ -20,8 +20,7 @@
{% for item in ironic_developer_constraints %}
{{ item }}
{% endfor %}
when:
- ironic_developer_mode | bool
when: ironic_developer_mode | bool
- include: ironic_install_apt.yml
static: no
@ -31,33 +30,13 @@
vars:
apt_pkgs: "{{ ironic_developer_mode_distro_packages }}"
- name: Clone requirements git repository
git:
repo: "{{ ironic_requirements_git_repo }}"
dest: "/opt/requirements"
clone: yes
update: yes
version: "{{ ironic_requirements_git_install_branch }}"
when:
- ironic_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:
- ironic_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 ironic_developer_mode | bool
- name: Install requires pip packages
pip:
name: "{{ ironic_requires_pip_packages | join(' ') }}"
state: "{{ ironic_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
@ -129,7 +108,10 @@
state: "{{ ironic_pip_package_state }}"
virtualenv: "{{ ironic_bin | dirname }}"
virtualenv_site_packages: "no"
extra_args: "{{ pip_install_options_fact }}"
extra_args: >-
{{ ironic_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