openstack/openstack-ansible-os_designate
Code Issues Proposed changes

Merge "Fix how constraints are added to pip_install_options"

Browse Source
This commit is contained in:
Jenkins 2016-03-17 20:58:02 +00:00 committed by Gerrit Code Review
commit bf92ffb46d
1 changed files with 13 additions and 6 deletions

19
tasks/designate_install.yml

@ -71,11 +71,18 @@
- name: Add constraints to pip_install_options fact for developer mode
set_fact:
pip_install_options: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt"
pip_install_options_fact: "{{ pip_install_options|default('') }} --constraint /opt/developer-pip-constraints.txt --constraint /opt/requirements/upper-constraints.txt"
when:
- designate_developer_mode | bool
- "'/opt/developer-pip-constraints.txt' not in pip_install_options|default('')"
- "'/opt/requirements/upper-constraints.txt' not in pip_install_options|default('')"
tags:
- designate-install
- designate-pip-packages
- name: Set pip_install_options_fact when not in developer mode
set_fact:
pip_install_options_fact: "{{ pip_install_options|default('') }}"
when:
- not designate_developer_mode | bool
tags:
- designate-install
- designate-pip-packages
@ -84,7 +91,7 @@
pip:
name: "{{ item }}"
state: present
extra_args: "{{ pip_install_options|default('') }}"
extra_args: "{{ pip_install_options_fact }}"
register: install_packages
until: install_packages|success
retries: 5
@ -203,7 +210,7 @@
state: present
virtualenv: "{{ designate_venv_bin | dirname }}"
virtualenv_site_packages: "no"
extra_args: "{{ pip_install_options|default('') }}"
extra_args: "{{ pip_install_options_fact }}"
register: install_packages
until: install_packages|success
retries: 5
@ -223,7 +230,7 @@
pip:
name: "{{ item }}"
state: present
extra_args: "{{ pip_install_options|default('') }}"
extra_args: "{{ pip_install_options_fact }}"
register: install_packages
until: install_packages|success
retries: 5