From 321b1ca24c7aa181975ff3f9dfd344e08a7c9d18 Mon Sep 17 00:00:00 2001 From: Carrol Cox Date: Mon, 14 Oct 2019 17:33:55 +0500 Subject: [PATCH] [FIX] linting --- defaults/main.yml | 10 +++++----- tasks/docker-compose-install.yml | 6 +++--- tasks/docker-shim.yml | 4 ++-- tasks/lazydocker-install.yml | 8 ++++---- tasks/setup-Debian.yml | 2 +- .../system/containerd.service.d/override.conf.j2 | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 5557d5f..189ef24 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,18 +6,18 @@ docker_package_state: present # Service options. docker_service_state: started -docker_service_enabled: yes +docker_service_enabled: true docker_restart_handler_state: restarted # Docker Compose options. -docker_compose_install: yes +docker_compose_install: true docker_compose_version: '1.24.1' docker_compose_path: '/usr/local/bin/docker-compose' docker_compose_url: "https://github.com/docker/compose/releases/download/{{ docker_compose_version }}/docker-compose-Linux-x86_64" # LazyDocker options. -lazydocker_install: yes -lazydocker_version: '0.4' +lazydocker_install: true +lazydocker_version: '0.7.4' lazydocker_path: '/usr/local/bin/lazydocker' lazydocker_url: "https://github.com/jesseduffield/lazydocker/releases/download/v{{ lazydocker_version }}/lazydocker_{{ lazydocker_version }}_Linux_x86_64.tar.gz" @@ -26,7 +26,7 @@ lazydocker_url: "https://github.com/jesseduffield/lazydocker/releases/download/v docker_apt_release_channel: stable docker_apt_arch: amd64 docker_apt_repository: "deb [arch={{ docker_apt_arch }}] https://download.docker.com/linux/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} {{ docker_apt_release_channel }}" -docker_apt_ignore_key_error: yes +docker_apt_ignore_key_error: true # Used only for RedHat/CentOS/Fedora. docker_yum_repo_url: https://download.docker.com/linux/{{ (ansible_distribution == "Fedora") | ternary("fedora","centos") }}/docker-{{ docker_edition }}.repo diff --git a/tasks/docker-compose-install.yml b/tasks/docker-compose-install.yml index 01dfdaa..4f6299b 100644 --- a/tasks/docker-compose-install.yml +++ b/tasks/docker-compose-install.yml @@ -2,14 +2,14 @@ - name: docker-compose | check binary installed stat: path: "{{ docker_compose_path }}" - changed_when: no + changed_when: false register: docker_compose_current_binary - name: docker-compose | get current binary version shell: | sudo -Hu nobody timeout 2 {{ docker_compose_path }} --version 2>&1 | grep -Eoi '([0-9]{1,}\.){1,3}[0-9]{1,}(|-[a-z0-9]{1,})' | sort -uV | head -1 register: docker_compose_current_version - changed_when: no + changed_when: false when: - docker_compose_current_binary.stat.exists @@ -17,7 +17,7 @@ get_url: url: "{{ docker_compose_url }}" dest: "{{ docker_compose_path }}" - force: yes + force: true owner: root mode: 0755 when: diff --git a/tasks/docker-shim.yml b/tasks/docker-shim.yml index 1ea5092..1dff997 100644 --- a/tasks/docker-shim.yml +++ b/tasks/docker-shim.yml @@ -3,7 +3,7 @@ shell: | sudo -Hu nobody timeout 2 docker --version 2>&1 | grep -Eoi '([0-9]{1,}\.){2,3}[0-9]{1,}(|-[a-z0-9]{1,})' | sort -uV | head -1 register: docker_current_version - changed_when: no + changed_when: false - name: docker-shim | Setup shim if required block: @@ -29,6 +29,6 @@ - name: docker-shim | Reload systemd daemon if template is changed systemd: - daemon_reload: yes + daemon_reload: true when: - docker_service_override_template is changed diff --git a/tasks/lazydocker-install.yml b/tasks/lazydocker-install.yml index ec1534f..78176dd 100644 --- a/tasks/lazydocker-install.yml +++ b/tasks/lazydocker-install.yml @@ -2,14 +2,14 @@ - name: lazydocker | check binary installed stat: path: "{{ lazydocker_path }}" - changed_when: no + changed_when: false register: lazydocker_current_binary - name: lazydocker | get current binary version shell: | sudo -Hu nobody timeout 2 {{ lazydocker_path }} --version 2>&1 | grep -Eoi '([0-9]{1,}\.){1,3}[0-9]{1,}(|-[a-z0-9]{1,})' | sort -uV | head -1 register: lazydocker_current_version - changed_when: no + changed_when: false when: - lazydocker_current_binary.stat.exists @@ -20,8 +20,8 @@ exclude: - 'README.md' - 'LICENSE' - remote_src: yes - force: yes + remote_src: true + force: true owner: root mode: 0755 when: diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 94c3e03..5d4e148 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -49,4 +49,4 @@ apt_repository: repo: "{{ docker_apt_repository }}" state: present - update_cache: yes + update_cache: true diff --git a/templates/etc/systemd/system/containerd.service.d/override.conf.j2 b/templates/etc/systemd/system/containerd.service.d/override.conf.j2 index adab53c..65c6368 100644 --- a/templates/etc/systemd/system/containerd.service.d/override.conf.j2 +++ b/templates/etc/systemd/system/containerd.service.d/override.conf.j2 @@ -1,3 +1,3 @@ -# {{ ansible_managed }} +{{ ansible_managed | comment }} [Service] ExecStartPre=