Use ansible_distribution. [ci skip]

analytically · analytically · commit 320b14475fdd · 2014-03-05T11:07:54.000+01:00
diff --git a/roles/oracle_jdk/tasks/main.yml b/roles/oracle_jdk/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
 # file: roles/oracle_jdk/tasks/main.yml
 
-- name: add webupd8team java repository for ubuntu
+- name: add webupd8team java repository for Ubuntu
   apt_repository: repo='ppa:webupd8team/java'
   when: ansible_distribution == "Ubuntu"
 
-- name: add webupd8team java repository for debian
+- name: add webupd8team java repository for Debian "wheezy"
   script: install_debian_webupd8team_repo.sh
   when:
     - ansible_distribution == "Debian"
diff --git a/roles/td_agent/tasks/main.yml b/roles/td_agent/tasks/main.yml
@@ -5,11 +5,11 @@
   apt_repository: repo='deb http://packages.treasure-data.com/precise/ precise contrib'
   tags: tdagent
 
-- name: install libssl0.9.8 for debian wheezy
+- name: install libssl0.9.8 for Debian "wheezy"
   script: install_debian_libssl0.9.8.sh
   when:
-    - ansible_os_family == "Debian"
-    - ansible_lsb["codename"] == "wheezy"
+    - ansible_distribution == "Debian"
+    - ansible_distribution_release == "wheezy"
 
 - name: install td-agent via apt
   apt: pkg=td-agent update_cache=yes force=yes
