From c5f29f8996ee9856f6fedfda066f2a4f045c1cb6 Mon Sep 17 00:00:00 2001
From: Chris Coley <chris@codingallnight.com>
Date: Sat, 16 Jun 2018 15:08:33 -0700
Subject: [PATCH] Adding the 'bootstrap' tag to the bootstrap.yml task list
---
tasks/bootstrap.yml | 60 +++++++++++++++++++++++----------------------
1 file changed, 31 insertions(+), 29 deletions(-)
diff --git a/tasks/bootstrap.yml b/tasks/bootstrap.yml
index f3c3b94..8e87d65 100644
--- a/tasks/bootstrap.yml
+++ b/tasks/bootstrap.yml
@@ -1,36 +1,38 @@
---
-- name: Check if Python is installed
- raw: test -x /usr/bin/python
- changed_when: false
- failed_when: false
- register: result
+- block:
+ - name: Check if Python is installed
+ raw: test -x /usr/bin/python
+ changed_when: false
+ failed_when: false
+ register: result
-- name: Install Python
- raw: >
- (test -e /etc/redhat-release && yum install -y python)
- || (test -e /etc/debian_version && apt-get -y update && apt-get install -y python)
- when: result.rc == 1
+ - name: Install Python
+ raw: >
+ (test -e /etc/redhat-release && yum install -y python)
+ || (test -e /etc/debian_version && apt-get -y update && apt-get install -y python)
+ when: result.rc == 1
-- name: Gather facts to determine host OS
- setup:
- gather_subset: min
+ - name: Gather facts to determine host OS
+ setup:
+ gather_subset: min
-- name: Gather OS specific vars
- include_vars: '{{ item }}'
- with_first_found:
- - 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
- - defaults/main.yml
+ - name: Gather OS specific vars
+ include_vars: '{{ item }}'
+ with_first_found:
+ - 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
+ - defaults/main.yml
-- 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
+ - 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
+ tags: bootstrap
...
# vi: set ts=2 sts=2 sw=2 et ft=yaml:
--
GitLab