Merge branch 'master' into wip-rm-calamari

diff --cc roles/ceph-mon/tasks/main.yml
index 426964dda4f2feb6a05aedc535996e6a72847b49,ef6eb621188d64de0f50fa9f4981b4eec110f032..3181879e8c5effe7e5512fc60c289624891decd7
--- 1/roles/ceph-mon/tasks/main.yml
--- 2/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