From b17881cf928d7adc101eaa5819bb5f8bd145c17e Mon Sep 17 00:00:00 2001 From: Sergey Malyuk Date: Tue, 16 Dec 2025 15:59:02 +0300 Subject: [PATCH] fix ansible-lint errors --- roles/rclone_yandex/meta/main.yml | 4 ++-- roles/rclone_yandex/molecule/default/converge.yml | 2 +- roles/rclone_yandex/tasks/configure.yaml | 10 +++++----- roles/rclone_yandex/tasks/install.yaml | 12 ++++++------ .../rclone_yandex/templates/rclone-yandex.service.j2 | 4 ++-- roles/rclone_yandex/vars/main.yml | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/roles/rclone_yandex/meta/main.yml b/roles/rclone_yandex/meta/main.yml index 94fef93..2bb3f62 100644 --- a/roles/rclone_yandex/meta/main.yml +++ b/roles/rclone_yandex/meta/main.yml @@ -10,8 +10,8 @@ galaxy_info: platforms: - name: "Ubuntu" - versions: [ "focal", "jammy" ] + versions: ["focal", "jammy"] - galaxy_tags: [ ] + galaxy_tags: [] dependencies: [] diff --git a/roles/rclone_yandex/molecule/default/converge.yml b/roles/rclone_yandex/molecule/default/converge.yml index afa49dd..7e6452e 100644 --- a/roles/rclone_yandex/molecule/default/converge.yml +++ b/roles/rclone_yandex/molecule/default/converge.yml @@ -13,7 +13,7 @@ autoclean: true roles: - - role: genlab.rclone_yandex + - role: genlab.common.rclone_yandex rclone_mountpoint: /mnt/yandex-disk rclone_group: yandex rclone_secrets: secrets/token.yml diff --git a/roles/rclone_yandex/tasks/configure.yaml b/roles/rclone_yandex/tasks/configure.yaml index c20f52c..60715f7 100644 --- a/roles/rclone_yandex/tasks/configure.yaml +++ b/roles/rclone_yandex/tasks/configure.yaml @@ -5,16 +5,16 @@ state: present - name: "Configure | get GID for '{{ rclone_group }}'" - register: rclone_group_gid + register: rclone_yandex_group_gid changed_when: false - failed_when: not rclone_group_gid.stdout + failed_when: not rclone_yandex_group_gid.stdout ansible.builtin.shell: cmd: 'set -o pipefail && getent group "{{ rclone_group }}" | cut -d: -f3' executable: /bin/bash - name: "Configure | display rclone mount ownership group" ansible.builtin.debug: - msg: "'{{ rclone_group }}' ({{ rclone_group_gid.stdout }})" + msg: "'{{ rclone_group }}' ({{ rclone_yandex_group_gid.stdout }})" - name: "Configure | set up directories" loop: @@ -30,7 +30,7 @@ - name: "Configure | create the [yandex] section" ansible.builtin.lineinfile: create: true - path: "{{ rclone_config_path }}" + path: "{{ rclone_yandex_config_path }}" line: "[yandex]" mode: "0660" @@ -40,7 +40,7 @@ - name: "Configure | insert/update the section for the [yandex] share" ansible.builtin.blockinfile: - path: "{{ rclone_config_path }}" + path: "{{ rclone_yandex_config_path }}" insertafter: "^[yandex]" block: | type = yandex diff --git a/roles/rclone_yandex/tasks/install.yaml b/roles/rclone_yandex/tasks/install.yaml index b42ae25..71cba8b 100644 --- a/roles/rclone_yandex/tasks/install.yaml +++ b/roles/rclone_yandex/tasks/install.yaml @@ -1,14 +1,14 @@ --- - name: "Install | unzip (RHEL)" ansible.builtin.dnf: - name: [ unzip ] + name: [unzip] state: installed when: ansible_os_family == 'RHEL' - name: "Install | unzip (Debian)" ansible.builtin.apt: update_cache: true - name: [ unzip ] + name: [unzip] state: present when: ansible_os_family == 'Debian' @@ -20,20 +20,20 @@ cmd: "rclone --version" rescue: - name: "Install | fetch and install the rclone binary" # noqa: no-changed-when - register: result - failed_when: result.rc != 0 + register: rclone_yandex_result + failed_when: rclone_yandex_result.rc != 0 ansible.builtin.shell: cmd: "set -o pipefail && curl https://rclone.org/install.sh | sudo bash" executable: /bin/bash - name: "Install | fuse (RHEL)" ansible.builtin.dnf: - name: [ fuse ] + name: [fuse] state: installed when: ansible_os_family == 'RHEL' - name: "Install | fuse (Debian)" ansible.builtin.apt: - name: [ fuse3 ] + name: [fuse3] state: present when: ansible_os_family == 'Debian' diff --git a/roles/rclone_yandex/templates/rclone-yandex.service.j2 b/roles/rclone_yandex/templates/rclone-yandex.service.j2 index a4601d8..c8df724 100644 --- a/roles/rclone_yandex/templates/rclone-yandex.service.j2 +++ b/roles/rclone_yandex/templates/rclone-yandex.service.j2 @@ -8,13 +8,13 @@ Wants=network-online.target Type=notify ExecStart= \ /usr/bin/rclone mount \ - --gid={{ rclone_group_gid.stdout }} \ + --gid={{ rclone_yandex_group_gid.stdout }} \ --dir-perms=0770 \ --file-perms=0660 \ --umask=007 \ --default-permissions \ --allow-other \ - --config "{{ rclone_config_path }}" \ + --config "{{ rclone_yandex_config_path }}" \ --log-file="/tmp/rclone/yandex.log" \ --log-level=INFO \ --vfs-cache-mode=off \ diff --git a/roles/rclone_yandex/vars/main.yml b/roles/rclone_yandex/vars/main.yml index d1baeea..ce372de 100644 --- a/roles/rclone_yandex/vars/main.yml +++ b/roles/rclone_yandex/vars/main.yml @@ -1,4 +1,4 @@ --- # vars file for rclone_yandex -rclone_config_path: "/root/rclone.conf" +rclone_yandex_config_path: "/root/rclone.conf"