From bd014f6b1ab36b421c00e3f08cc48b29e44aa5f8 Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Thu, 17 Mar 2016 13:44:02 +0000
Subject: [PATCH] Fix how constraints are added to pip_install_options

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
---
 tasks/glance_install.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/tasks/glance_install.yml b/tasks/glance_install.yml
index fb085e7e..01ef1e0d 100644
--- a/tasks/glance_install.yml
+++ b/tasks/glance_install.yml
@@ -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