Replace ansible_distribution_release by debian_version

apt/tasks/repositories.yml

@@ -5,7 +5,7 @@
 - name: enable debian repositories
   apt_repository:
     state: present
-    repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
+    repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
   with_nested:
     - "{{ apt_repos }}"
     - "{{ apt_sets|union([''])|unique }}"
@@ -18,7 +18,7 @@
 - name: disable debian repositories unused sets
   apt_repository:
     state: absent
-    repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
+    repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
   with_nested:
     - "{{ apt_repos }}"
     - "{{ ['', '-updates', '-backports', '-proposed-updates']|difference(apt_sets|union([''])) }}"
@@ -31,7 +31,7 @@
 - name: disable debian repositories unused repos
   apt_repository:
     state: absent
-    repo: "deb{{ src }} {{ apt_mirror }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
+    repo: "deb{{ src }} {{ apt_mirror }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
   with_nested:
     - "{{ ['main', 'contrib', 'non-free']|difference(apt_repos) }}"
     - ['', '-updates', '-backports', '-proposed-updates']
@@ -44,7 +44,7 @@
 - name: enable debian security repositories
   apt_repository:
     state: present
-    repo: "deb{{ src }} {{ apt_mirror_security }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
+    repo: "deb{{ src }} {{ apt_mirror_security }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
   with_nested:
     - "{{ apt_repos }}"
     - ['/updates']
@@ -58,7 +58,7 @@
 - name: disable debian security repositories unused repos
   apt_repository:
     state: absent
-    repo: "deb{{ src }} {{ apt_mirror_security }} {{ ansible_distribution_release }}{{ item[1] }} {{ item[0] }}"
+    repo: "deb{{ src }} {{ apt_mirror_security }} {{ debian_version }}{{ item[1] }} {{ item[0] }}"
   with_nested:
     - "{{ ['main', 'contrib', 'non-free']|difference(apt_repos) }}"
     - ['/updates']

ssh-server/tasks/main.yml

@@ -17,7 +17,7 @@
     mode: '0644'
     backup: true
     validate: '/usr/sbin/sshd -t -f %s'
-  when: ansible_distribution_release != "stretch"
+  when: debian_version == "jessie"
   notify:
     - restart sshd
   tags:
@@ -32,7 +32,7 @@
     mode: '0644'
     backup: true
     validate: '/usr/sbin/sshd -t -f %s'
-  when: ansible_distribution_release == "stretch"
+  when: debian_version != "jessie"
   notify:
     - restart sshd
   tags: