From 73382b7471ecdecf515d85a76e38de2d6596572e Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 12 May 2015 15:02:04 -0500 Subject: [PATCH] Make rhel 7.0 tasks run on any rhel 7.x version. This shouldn't have been restricted to only 7.0 in the first place. We noticed this problem while testing rhel 7.1 and noticing that firewalld was not disabled. Signed-off-by: Andrew Schoen --- roles/testnode/tasks/redhat/{rhel_7.0.yml => rhel_7.yml} | 0 roles/testnode/tasks/setup-redhat.yml | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename roles/testnode/tasks/redhat/{rhel_7.0.yml => rhel_7.yml} (100%) diff --git a/roles/testnode/tasks/redhat/rhel_7.0.yml b/roles/testnode/tasks/redhat/rhel_7.yml similarity index 100% rename from roles/testnode/tasks/redhat/rhel_7.0.yml rename to roles/testnode/tasks/redhat/rhel_7.yml diff --git a/roles/testnode/tasks/setup-redhat.yml b/roles/testnode/tasks/setup-redhat.yml index e37488d..cf07893 100644 --- a/roles/testnode/tasks/setup-redhat.yml +++ b/roles/testnode/tasks/setup-redhat.yml @@ -1,8 +1,8 @@ --- -- name: Include rhel 7.0 specific tasks. - include: redhat/rhel_7.0.yml - when: ansible_distribution_version == "7.0" +- name: Include rhel 7.x specific tasks. + include: redhat/rhel_7.yml + when: ansible_distribution_major_version == "7" - name: Include rhel 6.x specific tasks. include: redhat/rhel_6.yml -- 2.39.5