openstack/kayobe
Code Issues Proposed changes

User correct prefix for docker upper constraints variable

Browse Source
This commit is contained in:
Doug Szumski 2018-02-22 14:05:23 +00:00
parent 9b2c38712d
commit 6ad2a698c4
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/docker.yml
View File

@ -3,6 +3,8 @@
hosts: docker hosts: docker
tags: tags:
- docker - docker
vars:
- docker_upper_constraints_file: "{{ kolla_upper_constraints_file }}"
roles: roles:
- role: docker - role: docker
docker_daemon_mtu: "{{ public_net_name | net_mtu | default }}" docker_daemon_mtu: "{{ public_net_name | net_mtu | default }}"

4
ansible/roles/docker/defaults/main.yml
View File

@ -33,3 +33,7 @@ docker_registry_ca:
# MTU to pass through to containers not using net=host # MTU to pass through to containers not using net=host
docker_daemon_mtu: 1500 docker_daemon_mtu: 1500
# Upper constraints file which is passed to pip when installing packages
# into a venv.
docker_upper_constraints_file:

2
ansible/roles/docker/tasks/main.yml
View File

@ -18,7 +18,7 @@
pip: pip:
name: docker name: docker
state: latest state: latest
extra_args: "-c {{ kolla_upper_constraints_file }}" extra_args: "-c {{ docker_upper_constraints_file }}"
virtualenv: "{{ virtualenv is defined | ternary(virtualenv, omit) }}" virtualenv: "{{ virtualenv is defined | ternary(virtualenv, omit) }}"
become: "{{ virtualenv is not defined }}" become: "{{ virtualenv is not defined }}"