Merge "use include_tasks instead of include"
This commit is contained in:
commit
d77a41a052
|
@ -160,7 +160,7 @@
|
|||
- ceph_extra_confs is defined
|
||||
- inventory_hostname in groups[item]
|
||||
|
||||
- include: ceph_auth_extra.yml
|
||||
- include_tasks: ceph_auth_extra.yml
|
||||
when:
|
||||
- ceph_in_extra_auth_group is defined
|
||||
- ceph_in_extra_auth_group | bool
|
||||
|
@ -174,7 +174,7 @@
|
|||
- inventory_hostname in groups[ceph_extra_compute_group]
|
||||
- item.secret_uuid is defined
|
||||
|
||||
- include: ceph_auth_extra_compute.yml
|
||||
- include_tasks: ceph_auth_extra_compute.yml
|
||||
when:
|
||||
- ceph_extra_nova_uuid is defined
|
||||
- ceph_extra_nova_uuid | bool
|
||||
|
|
|
@ -60,7 +60,7 @@
|
|||
- inventory_hostname in groups[item]
|
||||
with_items: "{{ ceph_extra_config_groups }}"
|
||||
|
||||
- include: ceph_config_extra.yml
|
||||
- include_tasks: ceph_config_extra.yml
|
||||
when:
|
||||
- ceph_in_extra_config_group is defined
|
||||
- ceph_in_extra_config_group | bool
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
tags:
|
||||
- always
|
||||
|
||||
- include: "ceph_preinstall_{{ ansible_pkg_mgr }}.yml"
|
||||
- include_tasks: "ceph_preinstall_{{ ansible_pkg_mgr }}.yml"
|
||||
when:
|
||||
- ceph_mons != []
|
||||
- ceph_mons | list == ceph_mons
|
||||
|
@ -32,7 +32,7 @@
|
|||
tags:
|
||||
- ceph-install
|
||||
|
||||
- include: ceph_install.yml
|
||||
- include_tasks: ceph_install.yml
|
||||
static: no
|
||||
when:
|
||||
- ceph_mons != []
|
||||
|
@ -40,7 +40,7 @@
|
|||
tags:
|
||||
- ceph-install
|
||||
|
||||
- include: ceph_install_python_libs.yml
|
||||
- include_tasks: ceph_install_python_libs.yml
|
||||
static: no
|
||||
when:
|
||||
- ceph_mons != []
|
||||
|
@ -49,7 +49,7 @@
|
|||
tags:
|
||||
- ceph-install
|
||||
|
||||
- include: ceph_get_mon_host.yml
|
||||
- include_tasks: ceph_get_mon_host.yml
|
||||
static: no
|
||||
when:
|
||||
- ceph_mons != []
|
||||
|
@ -57,7 +57,7 @@
|
|||
tags:
|
||||
- ceph-config
|
||||
|
||||
- include: ceph_config.yml
|
||||
- include_tasks: ceph_config.yml
|
||||
static: no
|
||||
when:
|
||||
- ceph_mons != []
|
||||
|
@ -65,7 +65,7 @@
|
|||
tags:
|
||||
- ceph-config
|
||||
|
||||
- include: ceph_auth.yml
|
||||
- include_tasks: ceph_auth.yml
|
||||
static: no
|
||||
when:
|
||||
- cephx | bool
|
||||
|
|
Loading…
Reference in New Issue