From 6ad2a698c41d8231cdaf35ff5c0ad78650bebdf1 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Thu, 22 Feb 2018 14:05:23 +0000
Subject: [PATCH] User correct prefix for docker upper constraints variable
---
ansible/docker.yml | 2 ++
ansible/roles/docker/defaults/main.yml | 4 ++++
ansible/roles/docker/tasks/main.yml | 2 +-
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ansible/docker.yml b/ansible/docker.yml
index 4b6c8219a..76b179b70 100644
--- a/ansible/docker.yml
+++ b/ansible/docker.yml
@@ -3,6 +3,8 @@
hosts: docker
tags:
- docker
+ vars:
+ - docker_upper_constraints_file: "{{ kolla_upper_constraints_file }}"
roles:
- role: docker
docker_daemon_mtu: "{{ public_net_name | net_mtu | default }}"
diff --git a/ansible/roles/docker/defaults/main.yml b/ansible/roles/docker/defaults/main.yml
index bf7b7a3fb..c7c920db9 100644
--- a/ansible/roles/docker/defaults/main.yml
+++ b/ansible/roles/docker/defaults/main.yml
@@ -33,3 +33,7 @@ docker_registry_ca:
# MTU to pass through to containers not using net=host
docker_daemon_mtu: 1500
+
+# Upper constraints file which is passed to pip when installing packages
+# into a venv.
+docker_upper_constraints_file:
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 982059b31..7dca7d298 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 {{ kolla_upper_constraints_file }}"
+ extra_args: "-c {{ docker_upper_constraints_file }}"
virtualenv: "{{ virtualenv is defined | ternary(virtualenv, omit) }}"
become: "{{ virtualenv is not defined }}"