openstack
/
openstack-ansible-ceph_client
Code Issues Proposed changes

Merge "use include_tasks instead of include"

This commit is contained in:
Zuul 2018-08-17 03:51:21 +00:00 committed by Gerrit Code Review
parent af65a3535d e1117fc3a9
commit d77a41a052
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/ceph_auth.yml
View File

@ -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

2
tasks/ceph_config.yml
View File

@ -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

12
tasks/main.yml
View File

@ -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