Merge "Fix how constraints are added to pip_install_options"
This commit is contained in:
commit
bbd1f0e963
|
@ -86,11 +86,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:
|
||||
- ceilometer_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:
|
||||
- ceilometer-install
|
||||
- ceilometer-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 ceilometer_developer_mode | bool
|
||||
tags:
|
||||
- ceilometer-install
|
||||
- ceilometer-pip-packages
|
||||
|
@ -99,7 +106,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
|
||||
|
@ -217,7 +224,7 @@
|
|||
state: present
|
||||
virtualenv: "{{ ceilometer_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
|
||||
|
@ -236,7 +243,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
|
||||
|
|
Loading…
Reference in New Issue