From f1f6a0b107ea1139b97cf990e1e36dc840aa05af Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Thu, 22 Feb 2018 14:44:14 +0000
Subject: [PATCH] Don't specify -c flag to pip if no upper constraints

---
 ansible/overcloud-docker-sdk-upgrade.yml      | 2 +-
 ansible/roles/docker/tasks/main.yml           | 2 +-
 ansible/roles/kolla-ansible/tasks/install.yml | 2 +-
 ansible/roles/kolla/tasks/install.yml         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/overcloud-docker-sdk-upgrade.yml b/ansible/overcloud-docker-sdk-upgrade.yml
index 882b48b09..046a11af1 100644
--- a/ansible/overcloud-docker-sdk-upgrade.yml
+++ b/ansible/overcloud-docker-sdk-upgrade.yml
@@ -26,6 +26,6 @@
       pip:
         name: docker
         state: latest
-        extra_args: "-c {{ kolla_upper_constraints_file }}"
+        extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
         virtualenv: "{{ virtualenv is defined | ternary(virtualenv, omit) }}"
       become: "{{ virtualenv is not defined }}"
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 7dca7d298..49b13a741 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -18,7 +18,7 @@
   pip:
     name: docker
     state: latest
-    extra_args: "-c {{ docker_upper_constraints_file }}"
+    extra_args: "{% if docker_upper_constraints_file %}-c {{ docker_upper_constraints_file }}{% endif %}"
     virtualenv: "{{ virtualenv is defined | ternary(virtualenv, omit) }}"
   become: "{{ virtualenv is not defined }}"
 
diff --git a/ansible/roles/kolla-ansible/tasks/install.yml b/ansible/roles/kolla-ansible/tasks/install.yml
index fcfd5fc88..63b06e461 100644
--- a/ansible/roles/kolla-ansible/tasks/install.yml
+++ b/ansible/roles/kolla-ansible/tasks/install.yml
@@ -58,7 +58,7 @@
   pip:
     requirements: "{{ kolla_ansible_venv }}/requirements.txt"
     state: present
-    extra_args: "-c {{ kolla_upper_constraints_file }}"
+    extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
     virtualenv: "{{ kolla_ansible_venv }}"
 
 # This is a workaround for the lack of a python package for libselinux-python
diff --git a/ansible/roles/kolla/tasks/install.yml b/ansible/roles/kolla/tasks/install.yml
index 9e6010e77..103dce49c 100644
--- a/ansible/roles/kolla/tasks/install.yml
+++ b/ansible/roles/kolla/tasks/install.yml
@@ -65,7 +65,7 @@
     version: "{{ item.version | default(omit) }}"
     state: "{{ item.state | default('present') }}"
     virtualenv: "{{ kolla_venv }}"
-    extra_args: "-c {{ kolla_upper_constraints_file }}"
+    extra_args: "{% if kolla_upper_constraints_file %}-c {{ kolla_upper_constraints_file }}{% endif %}"
   with_items:
     # Intall Kolla from source.
     - name: "{{ kolla_source_path }}"