From 626d1d3e6d19c782630f81b68332e37b0dc0a27a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Evrard <jean-philippe@evrard.me>
Date: Mon, 20 Nov 2017 13:30:52 +0000
Subject: [PATCH] Remove one layer of includes

Under certain ansible versions, the default recursion level could
be reached, causing failures. We need to make sure we don't
go deep in levels, multiplying the useless includes.

This ceph_all file was not needed, and everything can be done
directly in main.yml.

Change-Id: I1c20f468faa53a76338b774c6afce2f7d6545bd7
---
 tasks/ceph_all.yml | 57 ----------------------------------------------
 tasks/main.yml     | 55 +++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 54 insertions(+), 58 deletions(-)
 delete mode 100644 tasks/ceph_all.yml

diff --git a/tasks/ceph_all.yml b/tasks/ceph_all.yml
deleted file mode 100644
index a452fca..0000000
--- a/tasks/ceph_all.yml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-# Copyright 2015, Serge van Ginderachter <serge@vanginderachter.be>
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-- name: Gather variables for each operating system
-  include_vars: "{{ item }}"
-  with_first_found:
-    - "{{ 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 }}.yml"
-  tags:
-    - always
-
-- include: "ceph_preinstall_{{ ansible_pkg_mgr }}.yml"
-  when:
-    - ceph_pkg_source != 'distro'
-  tags:
-    - ceph-install
-
-- include: ceph_install.yml
-  tags:
-    - ceph-install
-
-- include: ceph_install_python_libs.yml
-  static: no
-  when:
-    - openstack_service_venv_bin != ''
-  tags:
-    - ceph-install
-
-- include: ceph_get_mon_host.yml
-  tags:
-    - ceph-config
-
-- include: ceph_config.yml
-  tags:
-    - ceph-config
-
-- include: ceph_auth.yml
-  static: no
-  when:
-    - cephx | bool
-  tags:
-   - ceph-config
diff --git a/tasks/main.yml b/tasks/main.yml
index dfde261..bc72d34 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -13,10 +13,63 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-- include: ceph_all.yml
+- name: Gather variables for each operating system
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ 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 }}.yml"
+  tags:
+    - always
+
+- include: "ceph_preinstall_{{ ansible_pkg_mgr }}.yml"
+  when:
+    - ceph_mons != []
+    - ceph_mons | list == ceph_mons
+    - ceph_pkg_source != 'distro'
+  tags:
+    - ceph-install
+
+- include: ceph_install.yml
+  static: no
+  when:
+    - ceph_mons != []
+    - ceph_mons | list == ceph_mons
+  tags:
+    - ceph-install
+
+- include: ceph_install_python_libs.yml
+  static: no
+  when:
+    - ceph_mons != []
+    - ceph_mons | list == ceph_mons
+    - openstack_service_venv_bin != ''
+  tags:
+    - ceph-install
+
+- include: ceph_get_mon_host.yml
   static: no
   when:
     - ceph_mons != []
     - ceph_mons | list == ceph_mons
   tags:
     - ceph-config
+
+- include: ceph_config.yml
+  static: no
+  when:
+    - ceph_mons != []
+    - ceph_mons | list == ceph_mons
+  tags:
+    - ceph-config
+
+- include: ceph_auth.yml
+  static: no
+  when:
+    - cephx | bool
+    - ceph_mons != []
+    - ceph_mons | list == ceph_mons
+  tags:
+   - ceph-config