From fa67753f170e8d40a5bac2b2cead60e22779192a Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sun, 27 Jan 2019 12:05:23 -0500 Subject: [PATCH] Refactor distro vars include We can simplify this logic a little. Change-Id: Ib7429b7409e05af5b0b82e47c04633fe8e731cb8 Signed-off-by: Paul Belanger --- tasks/main.yaml | 7 +------ vars/{ubuntu.yaml => debian.yaml} | 0 2 files changed, 1 insertion(+), 6 deletions(-) rename vars/{ubuntu.yaml => debian.yaml} (100%) diff --git a/tasks/main.yaml b/tasks/main.yaml index b80b850..86a1bae 100644 --- a/tasks/main.yaml +++ b/tasks/main.yaml @@ -13,12 +13,7 @@ # under the License. --- - name: Include OS-specific variables - include_vars: "{{ ansible_distribution|lower }}.yaml" - when: ansible_os_family == 'Debian' - -- name: Include OS-specific variables - include_vars: "{{ ansible_os_family|lower }}.yaml" - when: ansible_os_family == 'RedHat' + include_vars: "{{ ansible_os_family | lower }}.yaml" - include: "{{ nodepool_task }}.yaml" with_items: "{{ nodepool_task_manager }}" diff --git a/vars/ubuntu.yaml b/vars/debian.yaml similarity index 100% rename from vars/ubuntu.yaml rename to vars/debian.yaml