Update dhcpd.yml

roles/network/tasks/dhcpd.yml

@@ -1,52 +1,59 @@
-- name: Install dhcp package
-  package: name=isc-dhcp-server
-           state=present
+- name: Install dhcp package (debuntu)
+  package:
+    name: isc-dhcp-server
+    state: present
   when: is_debuntu
   tags:
     - download
 
-- name: Install dhcp package
-  package: name=dhcp
-           state=present
+- name: Install dhcp package (not debuntu)
+  package:
+    name: dhcp
+    state: present
   when: not is_debuntu
   tags:
     - download
 
-- name: Create non-privileged user
-  user: name=dhcpd
-        createhome=no
+- name: Create non-privileged user 'dhcpd' (debuntu)
+  user:
+    name: dhcpd
+    createhome: no
   when: is_debuntu
 
-- name: Disable stock dhcp_service
-  service: name={{ dhcp_service }}
-           enabled=no
-           state=stopped
+- name: Disable stock dhcp_service (debuntu)
+  service:
+    name: "{{ dhcp_service }}"
+    enabled: no
+    state: stopped
   when: is_debuntu
 
-- name: Disable stock dhcp_service ipv6
-  service: name={{ dhcp_service }}6
-           enabled=no
-           state=stopped
+- name: Disable stock dhcp_service ipv6 (ubuntu-18)
+  service:
+    name: "{{ dhcp_service }}6"
+    enabled: no
+    state: stopped
   when: is_ubuntu_18
 
 - name: Install systemd unit file to /etc/systemd/system/dhcpd.service
-  template: src={{ item.src }}
-            dest={{ item.dest }}
-            owner=root
-            group=root
-            mode={{ item.mode }}
+  template:
+    src: "{{ item.src }}"
+    dest: "{{ item.dest }}"
+    owner: root
+    group: root
+    mode: "{{ item.mode }}"
   with_items:
    - { src: 'roles/network/templates/dhcp/dhcpd.service', dest: '/etc/systemd/system/dhcpd.service', mode: '0644' }
 
-- name: Create dhcpd needed files
+- name: Create file /var/lib/dhcpd/dhcpd.leases (redhat)
   command: touch /var/lib/dhcpd/dhcpd.leases
-           creates=/var/lib/dhcpd/dhcpd.leases
+    creates: /var/lib/dhcpd/dhcpd.leases
   when: is_redhat
 
-- name: Check lease's permissions
-  file: path=/var/lib/dhcpd/dhcpd.leases
-        owner=dhcpd
-        group=dhcpd
-        mode=0644
-        state=file
+- name: Set dhcpd.leases permissions/ownership (redhat)
+  file:
+    path: /var/lib/dhcpd/dhcpd.leases
+    owner: dhcpd
+    group: dhcpd
+    mode: 0644
+    state: file
   when: is_redhat