openstack/kolla-ansible
Code Issues Proposed changes

Merge "link kolla_logs volume to docker_runtime_directory if docker_runtime_directory variable exists"

Browse Source
This commit is contained in:
Zuul 2019-06-24 13:35:45 +00:00 committed by Gerrit Code Review
commit b32ddaa901
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ansible/group_vars/all.yml
View File

@ -94,6 +94,7 @@ docker_registry:
docker_namespace: "kolla" docker_namespace: "kolla"
docker_registry_username: docker_registry_username:
docker_registry_insecure: "{{ 'yes' if docker_registry else 'no' }}" docker_registry_insecure: "{{ 'yes' if docker_registry else 'no' }}"
docker_runtime_directory: ""
# Retention settings for Docker logs # Retention settings for Docker logs
docker_log_max_file: 5 docker_log_max_file: 5

2
ansible/roles/baremetal/defaults/main.yml
View File

@ -66,8 +66,6 @@ docker_storage_driver: ""
docker_custom_option: "" docker_custom_option: ""
docker_runtime_directory: ""
# Ubuntu 18+ does not have easy_install available due to # Ubuntu 18+ does not have easy_install available due to
# https://bugs.launchpad.net/ubuntu/+source/python-setuptools/+bug/1774419. # https://bugs.launchpad.net/ubuntu/+source/python-setuptools/+bug/1774419.
easy_install_available: >- easy_install_available: >-

2
ansible/roles/common/tasks/bootstrap.yml
View File

@ -9,6 +9,6 @@
- name: Link kolla_logs volume to /var/log/kolla - name: Link kolla_logs volume to /var/log/kolla
become: true become: true
file: file:
src: /var/lib/docker/volumes/kolla_logs/_data src: "{{ docker_runtime_directory or '/var/lib/docker' }}/volumes/kolla_logs/_data"
path: /var/log/kolla path: /var/log/kolla
state: link state: link