From c08b8e42fc5828102447a4e564b9c1a8a5a633e7 Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Tue, 17 Jul 2018 16:28:03 -0700
Subject: [PATCH] Prefix all task list paths with {{ role_path }}
---
tasks/bootstrap.yml | 22 +++++++++++-----------
tasks/diagnose-unpingable.yml | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tasks/bootstrap.yml b/tasks/bootstrap.yml
index dc84392..23f907d 100644
--- a/tasks/bootstrap.yml
+++ b/tasks/bootstrap.yml
@@ -8,7 +8,7 @@
failed_when: false
- name: If the host is not pingable, find out why
- include_tasks: tasks/diagnose-unpingable.yml
+ include_tasks: '{{ role_path }}/tasks/diagnose-unpingable.yml'
when: _can_ping.ping is not defined or _can_ping.ping != 'pong'
- name: Gather minimal facts to determine host OS
@@ -19,20 +19,20 @@
include_vars: '{{ item }}'
with_first_found:
- files:
- - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
- - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
- - vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
- - vars/{{ ansible_distribution | lower }}.yml
- - vars/{{ ansible_os_family | lower }}.yml
+ - '{{ role_path }}/vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml'
+ - '{{ role_path }}/vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml'
+ - '{{ role_path }}/vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml'
+ - '{{ role_path }}/vars/{{ ansible_distribution | lower }}.yml'
+ - '{{ role_path }}/vars/{{ ansible_os_family | lower }}.yml'
skip: true
- name: Include OS specific bootstrap tasks
include_tasks: '{{ item }}'
with_first_found:
- - tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml
- - tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml
- - tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml
- - tasks/bootstrap.{{ ansible_distribution | lower }}.yml
- - tasks/bootstrap.{{ ansible_os_family | lower }}.yml
+ - '{{ role_path }}/tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml'
+ - '{{ role_path }}/tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_release | lower }}.yml'
+ - '{{ role_path }}/tasks/bootstrap.{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml'
+ - '{{ role_path }}/tasks/bootstrap.{{ ansible_distribution | lower }}.yml'
+ - '{{ role_path }}/tasks/bootstrap.{{ ansible_os_family | lower }}.yml'
...
# vi: set ts=2 sts=2 sw=2 et ft=yaml:
diff --git a/tasks/diagnose-unpingable.yml b/tasks/diagnose-unpingable.yml
index 960854b..a823794 100644
--- a/tasks/diagnose-unpingable.yml
+++ b/tasks/diagnose-unpingable.yml
@@ -15,7 +15,7 @@
- name: Python is not found
when: _can_ping.rc is defined and _can_ping.rc == 127
block:
- - include_tasks: tasks/find-python-executable.yml
+ - include_tasks: '{{ role_path }}/tasks/find-python-executable.yml'
- fail:
msg: "Unable to find Python on {{ inventory_hostname }}.\n
Please set 'ansible_python_interpreter' to an executable Python interpreter.\n
--
GitLab