move setup

Author: ltalirz

tasks/config.yml

@@ -8,6 +8,7 @@
     owner: "root"
     group: "root"
     mode: "0644"
+  register: cvmfs_config_file
 
 - name: Set autofs timeout
   ansible.builtin.lineinfile:
@@ -27,3 +28,8 @@
     state: "{% if not cvmfs_auto_setup %}mounted{% elif cvmfs_force_unmount %}absent{% endif %}"
   when: (not cvmfs_auto_setup) or (cvmfs_force_unmount)
   loop: "{{ cvmfs_repositories }}"
+
+# cvmfs-auto-setup package not available for Debian so we have to run it manually...
+- name: Configure AutoFS
+  command: cvmfs_config setup
+  when: cvmfs_config_file.changed and ansible_os_family == 'Debian'  

tasks/debian.yml

@@ -26,7 +26,7 @@
   when: '"cvmfs-config-computecanada" in cvmfs_configuration'
 
 # Target hosts will need internet access anyway to install the actual packages via apt, so we might as well
-# install the apt config from the internet as well - if a version is not already installed. 
+# install the apt config from the internet as well - if a version is not already installed.
 # There is no benefit to abstracting this with the apt_repository module, and doing so would break idempotence
 # because these packages update themselves via their own apt repositories.
 
@@ -37,14 +37,14 @@
   when: ansible_facts.packages['cvmfs-release'] is not defined
 
 # Todo: repository configuration for apt missing
-#- name: Install Compute Canada apt repository
-#  apt:
-#    name: https://package.computecanada.ca/yum/cc-cvmfs-public/prod/other/computecanada-release-latest.noarch.rpm
-#    state: present
-#    validate_certs: yes
-#  when:
-#    - '"cvmfs-config-computecanada" in cvmfs_configuration'
-#    - ansible_facts.packages['computecanada-release'] is not defined
+# - name: Install Compute Canada apt repository
+#   apt:
+#     name: https://package.computecanada.ca/yum/cc-cvmfs-public/prod/other/computecanada-release-latest.noarch.rpm
+#     state: present
+#     validate_certs: yes
+#   when:
+#     - '"cvmfs-config-computecanada" in cvmfs_configuration'
+#     - ansible_facts.packages['computecanada-release'] is not defined
 
 # This task can be removed once the Compute Canada apt repository is configured
 - name: Workaround - install compute canada config package directly from URL
@@ -62,9 +62,4 @@
 - name: Install CVMFS client and configuration packages
   apt:
     name: "['cvmfs'] + {{ cvmfs_configuration }}"
-  register: cvmfs_client_install
-
-# cvmfs-auto-setup package not available for debian so we have to run it manually...
-- name: Configure AutoFS
-  command: cvmfs_config setup
-  when: cvmfs_client_install.changed
+  register: cvmfs_client_install

tasks/redhat.yml

@@ -51,10 +51,8 @@
     name: [ 'lvm2' ]
   when: cvmfs_client_configure_storage | bool
 
-
 - name: Install CVMFS client and configuration packages
   yum:
     name: "['cvmfs'] + {{ cvmfs_auto_setup_package }} + {{ cvmfs_configuration }}"
   vars:
     cvmfs_auto_setup_package: "{{ ['cvmfs-auto-setup'] if cvmfs_auto_setup|bool else [] }}"
-