internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-04-06 18:53:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use correct value of ansible_distribution in integration tests

Browse Source 
This fixes integration tests when run on a RHEL system.  Oddly, the
ansible_distribution='RedHat' when run on RHEL.
This commit is contained in:
James Laska
2014-03-06 15:52:15 -05:00
parent 5a235f9e99
commit ba9950a73a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/roles/test_service/tasks/main.yml
View File

@@ -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'

2
test/integration/roles/test_yum/tasks/main.yml
View File

@@ -17,5 +17,5 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
- include: 'yum.yml'
when: ansible_distribution in ('RHEL', 'CentOS', 'ScientificLinux', 'Fedora')
when: ansible_distribution in ['RedHat', 'CentOS', 'ScientificLinux', 'Fedora']