From ba9950a73a2352ab7976e1dc3f4a370f80b047c8 Mon Sep 17 00:00:00 2001 From: James Laska Date: Thu, 6 Mar 2014 15:52:15 -0500 Subject: [PATCH] Use correct value of ansible_distribution in integration tests This fixes integration tests when run on a RHEL system. Oddly, the ansible_distribution='RedHat' when run on RHEL. --- test/integration/roles/test_service/tasks/main.yml | 4 ++-- test/integration/roles/test_yum/tasks/main.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/roles/test_service/tasks/main.yml b/test/integration/roles/test_service/tasks/main.yml index a9da5d951a8..10a2a0d4837 100644 --- a/test/integration/roles/test_service/tasks/main.yml +++ b/test/integration/roles/test_service/tasks/main.yml @@ -11,7 +11,7 @@ - "install_result.mode == '0755'" - include: 'sysv_setup.yml' - when: ansible_distribution in ('RHEL', 'CentOS', 'ScientificLinux') + when: ansible_distribution in ['Redhat', 'CentOS', 'ScientificLinux'] - include: 'systemd_setup.yml' when: ansible_distribution == 'Fedora' - include: 'upstart_setup.yml' @@ -101,7 +101,7 @@ - "remove_result.state == 'absent'" - include: 'sysv_cleanup.yml' - when: ansible_distribution in ('RHEL', 'CentOS', 'ScientificLinux') + when: ansible_distribution in ['Redhat', 'CentOS', 'ScientificLinux'] - include: 'systemd_cleanup.yml' when: ansible_distribution == 'Fedora' - include: 'upstart_cleanup.yml' diff --git a/test/integration/roles/test_yum/tasks/main.yml b/test/integration/roles/test_yum/tasks/main.yml index 472dfff8e81..5df887ae9f9 100644 --- a/test/integration/roles/test_yum/tasks/main.yml +++ b/test/integration/roles/test_yum/tasks/main.yml @@ -17,5 +17,5 @@ # along with Ansible. If not, see . - include: 'yum.yml' - when: ansible_distribution in ('RHEL', 'CentOS', 'ScientificLinux', 'Fedora') + when: ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux', 'Fedora']