Merge "remove unessisary blocks"
This commit is contained in:
commit
db3e33380d
|
@ -17,21 +17,6 @@
|
||||||
|
|
||||||
# "login-defs" will search for and load any operating system variable file
|
# "login-defs" will search for and load any operating system variable file
|
||||||
|
|
||||||
# found within the "vars/" path. If no OS files are found the task will skip.
|
|
||||||
- name: Gather variables for each operating system
|
|
||||||
include_vars: "{{ item }}"
|
|
||||||
with_first_found:
|
|
||||||
- skip: true
|
|
||||||
files:
|
|
||||||
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
|
|
||||||
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
|
|
||||||
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
|
|
||||||
- "{{ ansible_distribution | lower }}.yml"
|
|
||||||
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
|
|
||||||
- "{{ ansible_os_family | lower }}.yml"
|
|
||||||
tags:
|
|
||||||
- always
|
|
||||||
|
|
||||||
- name: Install shadow-utils
|
- name: Install shadow-utils
|
||||||
package:
|
package:
|
||||||
name: shadow-utils
|
name: shadow-utils
|
||||||
|
|
|
@ -17,21 +17,6 @@
|
||||||
|
|
||||||
# "tripleo-ceph-common" will search for and load any operating system variable file
|
# "tripleo-ceph-common" will search for and load any operating system variable file
|
||||||
|
|
||||||
# found within the "vars/" path. If no OS files are found the task will skip.
|
|
||||||
- name: Gather variables for each operating system
|
|
||||||
include_vars: "{{ item }}"
|
|
||||||
with_first_found:
|
|
||||||
- skip: true
|
|
||||||
files:
|
|
||||||
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
|
|
||||||
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
|
|
||||||
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
|
|
||||||
- "{{ ansible_distribution | lower }}.yml"
|
|
||||||
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
|
|
||||||
- "{{ ansible_os_family | lower }}.yml"
|
|
||||||
tags:
|
|
||||||
- always
|
|
||||||
|
|
||||||
- name: set basic user fact
|
- name: set basic user fact
|
||||||
set_fact:
|
set_fact:
|
||||||
ansible_user: "{{ lookup('env', 'USER') }}"
|
ansible_user: "{{ lookup('env', 'USER') }}"
|
||||||
|
|
Loading…
Reference in New Issue