From 90446e8967b78e1d3187b6838be676755af21675 Mon Sep 17 00:00:00 2001 From: Patrick Ladd Date: Wed, 1 Jul 2020 16:51:32 -0400 Subject: [PATCH] Update to work for RHEL8 and future proof by making RHEL-6 the exception case --- tasks/main.yml | 6 +++--- vars/RedHat-6.yml | 2 ++ vars/RedHat-7.yml | 2 -- vars/RedHat.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 vars/RedHat-6.yml delete mode 100644 vars/RedHat-7.yml diff --git a/tasks/main.yml b/tasks/main.yml index 7755824..bf0bff3 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -3,11 +3,11 @@ - name: Include OS-specific variables. include_vars: "{{ ansible_os_family }}.yml" -- name: Include overrides specific to RHEL 7. - include_vars: RedHat-7.yml +- name: Include overrides specific to RHEL 6 and below + include_vars: RedHat-6.yml when: - ansible_os_family == 'RedHat' - - ansible_distribution_major_version == "7" + - ansible_distribution_major_version < "7" - name: Include overrides specific to Fedora. include_vars: Fedora.yml diff --git a/vars/RedHat-6.yml b/vars/RedHat-6.yml new file mode 100644 index 0000000..f635f28 --- /dev/null +++ b/vars/RedHat-6.yml @@ -0,0 +1,2 @@ +--- +nfs_server_daemon: nfs diff --git a/vars/RedHat-7.yml b/vars/RedHat-7.yml deleted file mode 100644 index 0538858..0000000 --- a/vars/RedHat-7.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -nfs_server_daemon: nfs-server diff --git a/vars/RedHat.yml b/vars/RedHat.yml index f635f28..0538858 100644 --- a/vars/RedHat.yml +++ b/vars/RedHat.yml @@ -1,2 +1,2 @@ --- -nfs_server_daemon: nfs +nfs_server_daemon: nfs-server