diff options
| author | spmfox <spmfox@foxwd.com> | 2023-06-17 00:43:37 -0400 |
|---|---|---|
| committer | spmfox <spmfox@foxwd.com> | 2023-06-17 00:43:37 -0400 |
| commit | 44646dacd59db844e039a9ca566c7c48e35abe1b (patch) | |
| tree | 6a25d4316c807327ff015c719ecec97b76ab58f7 /roles | |
| parent | f035f1f259dd617e8d4459008d7e1165ea04c025 (diff) | |
ansible-lint cleanup
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/guest-configure/tasks/automatic-update.yml | 6 | ||||
| -rw-r--r-- | roles/guest-configure/tasks/services.yml | 2 | ||||
| -rw-r--r-- | roles/guest-configure/tasks/user.yml | 12 | ||||
| -rw-r--r-- | roles/libvirt/tasks/vm-check-duplicate.yml | 2 | ||||
| -rw-r--r-- | roles/libvirt/tasks/vm-check-exists.yml | 1 | ||||
| -rw-r--r-- | roles/libvirt/tasks/vm-install.yml | 1 | ||||
| -rw-r--r-- | roles/libvirt/vars/main.yml | 1 | ||||
| -rw-r--r-- | roles/zfs/tasks/dataset-confirm-info.yml | 1 |
8 files changed, 12 insertions, 14 deletions
diff --git a/roles/guest-configure/tasks/automatic-update.yml b/roles/guest-configure/tasks/automatic-update.yml index 71c102e..638328c 100644 --- a/roles/guest-configure/tasks/automatic-update.yml +++ b/roles/guest-configure/tasks/automatic-update.yml @@ -1,4 +1,5 @@ - name: RedHat block + when: ansible_os_family == "RedHat" block: - name: Install dnf-automatic (RedHat) ansible.builtin.package: @@ -7,7 +8,6 @@ - name: Enable dnf-automatic systemd service (RedHat) ansible.builtin.service: - name: dnf-automatic-install.timer - enabled: yes + name: dnf-automatic-install.timer + enabled: true state: started - when: ansible_os_family == "RedHat" diff --git a/roles/guest-configure/tasks/services.yml b/roles/guest-configure/tasks/services.yml index 56a5626..53cb904 100644 --- a/roles/guest-configure/tasks/services.yml +++ b/roles/guest-configure/tasks/services.yml @@ -1,6 +1,6 @@ - name: Enable and start services ansible.builtin.service: name: "{{ item }}" - enabled: yes + enabled: true state: started loop: "{{ guest_configure_services }}" diff --git a/roles/guest-configure/tasks/user.yml b/roles/guest-configure/tasks/user.yml index 5be5b3f..8f3e27d 100644 --- a/roles/guest-configure/tasks/user.yml +++ b/roles/guest-configure/tasks/user.yml @@ -16,35 +16,35 @@ when: guest_configure_ssh_key|length > 0 - name: RedHat block + when: ansible_os_family == "RedHat" block: - name: Add user to sudo group (RedHat) ansible.builtin.user: name: "{{ guest_configure_user }}" groups: "wheel" - append: yes + append: true - name: Allow wheel group nopasswd in sudoers (RedHat) - lineinfile: + ansible.builtin.lineinfile: path: /etc/sudoers state: present regexp: '^%wheel' line: '%wheel ALL=(ALL) NOPASSWD: ALL' validate: 'visudo -cf %s' - when: ansible_os_family == "RedHat" - name: Debian block + when: ansible_os_family == "Debian" block: - name: Add user to sudo group (Debian) ansible.builtin.user: name: "{{ guest_configure_user }}" groups: "sudo" - append: yes + append: true - name: Allow sudo group nopasswd in sudoers (Debian) - lineinfile: + ansible.builtin.lineinfile: path: /etc/sudoers state: present regexp: '^%sudo' line: '%sudo ALL=(ALL) NOPASSWD: ALL' validate: 'visudo -cf %s' - when: ansible_os_family == "Debian" diff --git a/roles/libvirt/tasks/vm-check-duplicate.yml b/roles/libvirt/tasks/vm-check-duplicate.yml index 5da0725..8f2d903 100644 --- a/roles/libvirt/tasks/vm-check-duplicate.yml +++ b/roles/libvirt/tasks/vm-check-duplicate.yml @@ -6,4 +6,4 @@ - name: Fail if VM exists ansible.builtin.fail: msg: "VM {{ libvirt_vm_name }} is already in-use." - when: libvirt_vm_name | string in vms_list.list_vms + when: libvirt_vm_name | string in vms_list.list_vms diff --git a/roles/libvirt/tasks/vm-check-exists.yml b/roles/libvirt/tasks/vm-check-exists.yml index 3b80f23..82a6d34 100644 --- a/roles/libvirt/tasks/vm-check-exists.yml +++ b/roles/libvirt/tasks/vm-check-exists.yml @@ -7,4 +7,3 @@ ansible.builtin.fail: msg: "VM {{ libvirt_vm_name }} does not exist." when: libvirt_vm_name | string not in vms_list.list_vms - diff --git a/roles/libvirt/tasks/vm-install.yml b/roles/libvirt/tasks/vm-install.yml index c0611e5..9acb530 100644 --- a/roles/libvirt/tasks/vm-install.yml +++ b/roles/libvirt/tasks/vm-install.yml @@ -2,6 +2,7 @@ ansible.builtin.template: src: "kickstart/{{ libvirt_vm_kickstart_file }}" dest: "/{{ libvirt_vm_destination }}/{{ libvirt_vm_kickstart_file }}" + mode: '0644' when: libvirt_vm_kickstart_file|length > 0 - name: Create VM from kickstart in destination filesystem diff --git a/roles/libvirt/vars/main.yml b/roles/libvirt/vars/main.yml index 1c26e68..2c1456e 100644 --- a/roles/libvirt/vars/main.yml +++ b/roles/libvirt/vars/main.yml @@ -12,4 +12,3 @@ libvirt_kickstart_hostname: "{{ inventory_hostname }}" libvirt_kickstart_timezone: "{{ timezone if timezone is defined else 'Etc/GMT' }}" libvirt_kickstart_root_ssh_key: "{{ ssh_key if ssh_key is defined }}" libvirt_kickstart_root_password: "{{ root_password if root_password is defined else lookup('password', '/dev/null length=32 chars=ascii_letters,digits') }}" - diff --git a/roles/zfs/tasks/dataset-confirm-info.yml b/roles/zfs/tasks/dataset-confirm-info.yml index 65885fb..548d10a 100644 --- a/roles/zfs/tasks/dataset-confirm-info.yml +++ b/roles/zfs/tasks/dataset-confirm-info.yml @@ -7,4 +7,3 @@ ansible.builtin.fail: msg: "Dataset {{ zfs_dataset }} contains child datasets." when: dataset_facts.ansible_facts.ansible_zfs_datasets[0].usedbychildren != "0B" - |
