From e10ff85f312bcc36b5c543996396e8bd39224abf Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 6 Mar 2018 11:45:17 -0500 Subject: [PATCH] Merge OS-specific variables for ubuntu Now that we are using systemd everywhere, for xenial++ there isn't a need to release specific settings. Change-Id: I41567021ccb1fe86016278f52b3f0b4356fce363 Signed-off-by: Paul Belanger --- tasks/main.yaml | 2 +- vars/{ubuntu-xenial.yaml => ubuntu.yaml} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename vars/{ubuntu-xenial.yaml => ubuntu.yaml} (100%) diff --git a/tasks/main.yaml b/tasks/main.yaml index 22d38de..74401b4 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -13,7 +13,7 @@ # under the License. --- - name: Include OS-specific variables. - include_vars: "{{ ansible_distribution|lower }}-{{ ansible_distribution_release }}.yaml" + include_vars: "{{ ansible_distribution|lower }}.yaml" when: ansible_os_family == 'Debian' - name: Include OS-specific variables. diff --git a/vars/ubuntu-xenial.yaml b/vars/ubuntu.yaml similarity index 100% rename from vars/ubuntu-xenial.yaml rename to vars/ubuntu.yaml