ソースを参照

Don't rely on lsb-release package

Markus Lindenberg 8 年 前
コミット
7370c378dc

+ 2 - 4
roles/common-repos/tasks/main.yml

@@ -3,10 +3,8 @@
 - name: Ensure deb-src ist disabled in sources.list
   replace: dest=/etc/apt/sources.list regexp='^(deb-src .*)$' replace='#\1'
 
-- name: Ensure lsb-release is installed
-  apt: name=lsb-release
 - name: Ensure Debian backports repository is installed
-  apt_repository: repo='deb http://ftp.de.debian.org/debian {{ ansible_lsb.codename|lower }}-backports main'
+  apt_repository: repo='deb http://ftp.de.debian.org/debian {{ ansible_distribution_release }}-backports main'
 
 # - name: Ensure FFDO repository key is installed
 #   apt_key:
@@ -14,7 +12,7 @@
 #     data: "{{ lookup('file', 'markus.gpg') }}"
 
 # - name: ensure FFDO APT repository is installed
-#   apt_repository: repo='deb {{ ffdo_repo }} {{ ansible_lsb.codename|lower }} main'
+#   apt_repository: repo='deb {{ ffdo_repo }} {{ ansible_distribution_release }} main'
 
 - name: Update APT cache
   apt: update_cache=yes cache_valid_time=3600

+ 1 - 1
roles/common-system/tasks/kernel.yml

@@ -1,4 +1,4 @@
 ---
 
 - name: Ensure latest backports kernel is installed
-  apt: name=linux-image-amd64 state=latest default_release={{ ansible_lsb.codename|lower }}-backports install_recommends=no
+  apt: name=linux-image-amd64 state=latest default_release={{ ansible_distribution_release }}-backports install_recommends=no

+ 1 - 1
roles/mesh-routing/tasks/bird.yml

@@ -6,7 +6,7 @@
     data: "{{ lookup('file', 'bird.gpg') }}"
 
 - name: Ensure bird Debian repository is installed
-  apt_repository: repo='deb http://bird.network.cz/debian {{ ansible_lsb.codename|lower }} main'
+  apt_repository: repo='deb http://bird.network.cz/debian {{ ansible_distribution_release }} main'
 
 - name: Ensure bird routing daemon is installed
   apt: name=bird install_recommends=no