Merge pull request #126 from bedroge/fix_lint_errors

Fix Ansible lint errors

Author: ocaisa

.github/workflows/Dockerfile-centos-7

@@ -5,6 +5,7 @@ USER root
 RUN yum install -y epel-release
 RUN yum install -y ansible
 RUN yum install -y cronie
+RUN yum install -y git
 
 COPY ./.github/workflows/test-playbook.sh /test-playbook.sh
 

.github/workflows/Dockerfile-rockylinux-8

@@ -5,6 +5,7 @@ USER root
 RUN yum install -y epel-release
 RUN yum install -y ansible
 RUN yum install -y cronie
+RUN yum install -y git
 
 COPY ./.github/workflows/test-playbook.sh /test-playbook.sh
 

.github/workflows/Dockerfile-ubuntu-18.04

@@ -3,7 +3,7 @@ FROM ubuntu:18.04
 USER root
 
 RUN apt-get update
-RUN apt-get install -y cron gpg python3.8 python3-pip systemd
+RUN apt-get install -y cron gpg python3.8 python3-pip systemd git
 
 RUN python3.8 -m pip install -U pip
 RUN python3.8 -m pip install ansible

.github/workflows/Dockerfile-ubuntu-20.04

@@ -3,7 +3,7 @@ FROM ubuntu:20.04
 USER root
 
 RUN apt-get update
-RUN apt-get install -y cron gpg python3-pip
+RUN apt-get install -y cron gpg python3-pip git
 RUN env DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -y systemd
 
 RUN pip3 install ansible

inventory/group_vars/all.yml

@@ -75,7 +75,7 @@ eessi_cvmfs_repositories:
       - CVMFS_AUTO_TAG_TIMESPAN="30 days ago"
       - CVMFS_GARBAGE_COLLECTION=true
     client_options: []
-    use_for_ci: no
+    use_for_ci: false
   - repository: ci.eessi-hpc.org
     stratum0: rug-nl.stratum0.cvmfs.eessi-infra.org
     owner: "{{ cvmfs_repo_owner | default('root') }}"
@@ -84,7 +84,7 @@ eessi_cvmfs_repositories:
       - CVMFS_AUTO_GC=false
       - CVMFS_GARBAGE_COLLECTION=true
     client_options: []
-    use_for_ci: yes
+    use_for_ci: true
 
 # Override all the Galaxy defaults by our EESSI defaults.
 # This is required, beucase the galaxy_* variables are used inside the Ansible tasks.

prepare-client-packages.yml

@@ -19,16 +19,16 @@
 
     - name: Create directory structure for the CVMFS config
       file:
-       path: "{{ item }}"
-       state: directory
-       mode: 0775
+        path: "{{ item }}"
+        state: directory
+        mode: 0775
       with_items:
-      - "{{ package_source_dir }}"
-      - "{{ package_source_dir }}/etc"
-      - "{{ package_source_dir }}/etc/cvmfs"
-      - "{{ package_source_dir }}/etc/cvmfs/keys"
-      - "{{ package_source_dir }}/etc/cvmfs/keys/{{ eessi_domain }}"
-      - "{{ package_source_dir }}/etc/cvmfs/domain.d"
+        - "{{ package_source_dir }}"
+        - "{{ package_source_dir }}/etc"
+        - "{{ package_source_dir }}/etc/cvmfs"
+        - "{{ package_source_dir }}/etc/cvmfs/keys"
+        - "{{ package_source_dir }}/etc/cvmfs/keys/{{ eessi_domain }}"
+        - "{{ package_source_dir }}/etc/cvmfs/domain.d"
 
     - name: Make EESSI CVMFS public key files
       copy:

requirements.yml

@@ -4,7 +4,8 @@
 roles:
 
   - name: galaxyproject.cvmfs
-    version: 0.2.14
+    src: https://github.com/galaxyproject/ansible-cvmfs
+    version: 7fa3a81
 
   - name: geerlingguy.repo-epel
     version: 3.0.0

roles/create_cvmfs_content_structure/defaults/main.yml

@@ -1,3 +1,3 @@
-cvmfs_start_transaction: yes
-cvmfs_publish_transaction: yes
-cvmfs_abort_transaction_on_failures: yes
+cvmfs_start_transaction: true
+cvmfs_publish_transaction: true
+cvmfs_abort_transaction_on_failures: true

roles/create_cvmfs_content_structure/tasks/do_repo.yml

@@ -2,48 +2,48 @@
 ---
 
 - name: "Include the vars file for {{ cvmfs_repo }}"
-  include_vars: "{{ cvmfs_repo }}.yml"
+  ansible.builtin.include_vars: "{{ cvmfs_repo }}.yml"
 
 - name: Start transaction
-  command: "cvmfs_server transaction {{ cvmfs_repo }}"
+  ansible.builtin.command: "cvmfs_server transaction {{ cvmfs_repo }}"
   when: cvmfs_start_transaction
 
-- block:
-
+- name: Apply changes to CVMFS repository, if there are any
+  block:
   - name: "Create symlinks"
-    file:
+    ansible.builtin.file:
       path: "/cvmfs/{{ cvmfs_repo }}/{{ item }}"
       src: "{{ symlinks[item] }}"
       state: link
-      force: yes
+      force: true
     with_items: "{{ symlinks }}"
     register: create_symlinks
 
   - name: "Copy files"
-    copy:
+    ansible.builtin.copy:
       src: "{{ item.name }}"
       dest: "/cvmfs/{{ cvmfs_repo }}/{{ item.dest }}"
       mode: "{{ item.mode }}"
     with_items: "{{ files }}"
     register: create_files
 
   - name: Publish transaction
-    command: "cvmfs_server publish {{ cvmfs_repo }}"
+    ansible.builtin.command: "cvmfs_server publish {{ cvmfs_repo }}"
     when:
       - cvmfs_start_transaction
       - cvmfs_publish_transaction
       - create_symlinks.changed or create_files.changed
     register: publish
 
   - name: Abort transaction
-    command: "cvmfs_server abort {{ cvmfs_repo }}"
+    ansible.builtin.command: "cvmfs_server abort {{ cvmfs_repo }}"
     when: publish is skipped
 
   rescue:
     - name: Abort transaction
-      command: "cvmfs_server abort {{ cvmfs_repo }}"
+      ansible.builtin.command: "cvmfs_server abort {{ cvmfs_repo }}"
       when: cvmfs_start_transaction and cvmfs_abort_transaction_on_failures
 
     - name: Exit because of failure
-      fail:
+      ansible.builtin.fail:
         msg: "Task {{ ansible_failed_task }} failed, with result {{ ansible_failed_result }}."

roles/create_cvmfs_content_structure/tasks/main.yml

@@ -3,13 +3,13 @@
 
 - name: "Find which repositories have a vars file..."
   delegate_to: localhost
-  stat:
+  ansible.builtin.stat:
     path: "{{ role_path }}/vars/{{ item.repository }}.yml"
   with_items: "{{ eessi_cvmfs_repositories }}"
   register: repo_vars_file
 
 - name: "Apply do_repo for each repository with a vars file"
-  include_tasks: do_repo.yml
+  ansible.builtin.include_tasks: do_repo.yml
   vars:
     cvmfs_repo: "{{ repo_vars_file.item.repository }}"
   when: repo_vars_file.stat.exists
@@ -19,4 +19,3 @@
   args:
     apply:
       become: "{{ 'yes' if repo_vars_file.item.owner == 'root' else 'no' }}"
-