From: Sébastien Han <seb@redhat.com>
Date: Mon, 29 Oct 2018 13:50:37 +0000 (+0100)
Subject: Merge branch 'master' into wip-rm-calamari
X-Git-Tag: v3.2.0rc1~23^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3147%2Fhead;p=ceph-ansible.git

Merge branch 'master' into wip-rm-calamari
---

0e63f0f3c93909b36f482604febfdd55675ed351
diff --cc roles/ceph-mon/tasks/main.yml
index 426964dda,ef6eb6211..3181879e8
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@@ -37,4 -35,8 +35,4 @@@
      - crush_rule_config
  
  - name: include set_osd_pool_default_pg_num.yml
-   include: set_osd_pool_default_pg_num.yml
+   include_tasks: set_osd_pool_default_pg_num.yml
 -
 -- name: include calamari.yml
 -  include_tasks: calamari.yml
 -  when: calamari