Specify search path for os vars; support odd-numbered Ubuntu releases.

willshersystems · Feb 25, 2019 · 4a0f7d9 · 4a0f7d9
1 parent 81bd585
commit 4a0f7d9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/meta/main.yml b/meta/main.yml
@@ -1,7 +1,7 @@
 ---
 galaxy_info:
   author: Matt Willsher
-  description: OpenSSH SSH deamon configuration
+  description: OpenSSH SSH daemon configuration
   company: Willsher Systems
   license: LGPLv3
   min_ansible_version: 1.8

diff --git a/tasks/variables.yml b/tasks/variables.yml
@@ -2,12 +2,24 @@
 
 - name: Set OS dependent variables
   include_vars: "{{ item }}"
+  vars:
+    ansible_distribution_lts_offset: '{{
+      ansible_distribution_major_version|int % 2
+      if ansible_distribution == "Ubuntu"
+      else 0 }}'
+    ansible_distribution_lts_version: '{{
+      ansible_distribution_major_version|int -
+      ansible_distribution_lts_offset|int }}'
   with_first_found:
-   - "{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml"
-   - "{{ ansible_distribution }}.yml"
-   - "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml"
-   - "{{ ansible_os_family }}.yml"
-   - default.yml
+    - files:
+        - "{{ ansible_distribution }}_{{ ansible_distribution_lts_version }}.yml"
+        - "{{ ansible_distribution }}.yml"
+        - "{{ ansible_os_family }}_{{ ansible_distribution_major_version }}.yml"
+        - "{{ ansible_os_family }}.yml"
+        - default.yml
+      paths:
+        - '{{ role_path }}/vars'
+        - '{{ playbook_dir }}/vars'
 
 - name: Override OS defaults
   block: