From d1eae82de71cc2d1412e891cc6d96793d2152e14 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Fri, 20 Sep 2019 16:47:25 -0500 Subject: [PATCH] remove unessisary blocks These roles have no vars files so theres no need to try and load vars that dont exist. Change-Id: I93ceedc4eb092a356f42f5f5823bea0729a2be27 Signed-off-by: Kevin Carter --- tripleo_ansible/roles/login-defs/tasks/main.yml | 15 --------------- .../roles/tripleo-ceph-common/tasks/main.yml | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/tripleo_ansible/roles/login-defs/tasks/main.yml b/tripleo_ansible/roles/login-defs/tasks/main.yml index 349dedbee..20ae025a8 100644 --- a/tripleo_ansible/roles/login-defs/tasks/main.yml +++ b/tripleo_ansible/roles/login-defs/tasks/main.yml @@ -17,21 +17,6 @@ # "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 package: name: shadow-utils diff --git a/tripleo_ansible/roles/tripleo-ceph-common/tasks/main.yml b/tripleo_ansible/roles/tripleo-ceph-common/tasks/main.yml index 3c71fcfa5..c5a54d2e7 100644 --- a/tripleo_ansible/roles/tripleo-ceph-common/tasks/main.yml +++ b/tripleo_ansible/roles/tripleo-ceph-common/tasks/main.yml @@ -17,21 +17,6 @@ # "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 set_fact: ansible_user: "{{ lookup('env', 'USER') }}"