diff --git a/oct/ansible/oct/roles/docker/tasks/configure_docker_daemon_storage.yml b/oct/ansible/oct/roles/docker/tasks/configure_docker_daemon_storage.yml index d3c95f80..0503e221 100644 --- a/oct/ansible/oct/roles/docker/tasks/configure_docker_daemon_storage.yml +++ b/oct/ansible/oct/roles/docker/tasks/configure_docker_daemon_storage.yml @@ -12,5 +12,10 @@ dest: /etc/sysconfig/docker-storage-setup line: "VG={{ origin_ci_docker_volume_group }}" +- name: Set EXTRA_STORAGE_OPTIONS for docker-storage-setup + lineinfile: + dest: /etc/sysconfig/docker-storage-setup + line: "EXTRA_STORAGE_OPTIONS='--storage-opt dm.libdm_log_level=3'" + - name: Run docker-storage-setup command: docker-storage-setup diff --git a/oct/ansible/oct/roles/docker/tasks/main.yml b/oct/ansible/oct/roles/docker/tasks/main.yml index 0c92cf33..fbe86919 100644 --- a/oct/ansible/oct/roles/docker/tasks/main.yml +++ b/oct/ansible/oct/roles/docker/tasks/main.yml @@ -21,6 +21,20 @@ regexp: '^ADD_REGISTRY=(.*)' line: '# ADD_REGISTRY=\1' +- name: log to json-file to avoid flooding journald + lineinfile: + backrefs: yes + dest: /etc/sysconfig/docker + regexp: '^OPTIONS=(.*) --log-driver=journald (.*)' + line: 'OPTIONS=\1 --log-driver=json-file --log-opt max-size=50m \2' + +- name: turn on docker daemon debugging + lineinfile: + backrefs: yes + dest: /etc/sysconfig/docker + regexp: "^OPTIONS='(.*)'" + line: "OPTIONS='--debug \\1'" + - name: configure the OpenShift storage include: configure_openshift_storage.yml