openstack/openstack-ansible-os_glance
Code Issues Proposed changes

Fix how constraints are added to pip_install_options

Browse Source 
This commit changes the pip_install_options fact name in
glance_install.yml to pip_install_options_fact.  This allows us to
maintain the existing pip_install_options variable without overwriting
it with options when in developer mode, which ultimately means we can
have multiple services running in a container use a combination of
*_developer_mode: true and *_developer_mode: false.  At the moment,
if a service writes pip_install_options fact with the constraints
options, those options will persist to other services running in the
container even if *_developer_mode: false.

Change-Id: Id0fb436f886f904b6f4f44a9db5f95864c18a409
This commit is contained in:
Matt Thompson 2016-03-17 13:44:02 +00:00 committed by Jesse Pretorius (odyssey4me)
parent fb042fa021
commit bd014f6b1a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tasks/glance_install.yml
View File

@ -58,11 +58,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:
- glance_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:
- glance-install
- glance-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 glance_developer_mode | bool
tags:
- glance-install
- glance-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
@ -202,7 +209,7 @@
state: present
virtualenv: "{{ glance_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
@ -221,7 +228,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