Merge "Use include instead of import for conditional tasks"
This commit is contained in:
commit
5a839b7af3
|
@ -103,17 +103,15 @@
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
|
|
||||||
- import_tasks: nova_virt_detect.yml
|
- include_tasks: nova_virt_detect.yml
|
||||||
when:
|
when:
|
||||||
- nova_virt_type is not defined
|
- nova_virt_type is not defined
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
- nova-config
|
|
||||||
|
|
||||||
- import_tasks: nova_mdev_detect.yml
|
- import_tasks: nova_mdev_detect.yml
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
- nova-config
|
|
||||||
|
|
||||||
- import_tasks: nova_pre_install.yml
|
- import_tasks: nova_pre_install.yml
|
||||||
tags:
|
tags:
|
||||||
|
@ -233,11 +231,15 @@
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
|
|
||||||
- import_tasks: nova_db_setup.yml
|
- include_tasks: nova_db_setup.yml
|
||||||
|
args:
|
||||||
|
apply:
|
||||||
|
tags:
|
||||||
|
- nova-config
|
||||||
when:
|
when:
|
||||||
- _nova_is_first_play_host
|
- _nova_is_first_play_host
|
||||||
tags:
|
tags:
|
||||||
- nova-config
|
- always
|
||||||
|
|
||||||
- name: Import uwsgi role
|
- name: Import uwsgi role
|
||||||
import_role:
|
import_role:
|
||||||
|
@ -245,6 +247,8 @@
|
||||||
vars:
|
vars:
|
||||||
uwsgi_services: "{{ uwsgi_nova_services }}"
|
uwsgi_services: "{{ uwsgi_nova_services }}"
|
||||||
uwsgi_install_method: "{{ nova_install_method }}"
|
uwsgi_install_method: "{{ nova_install_method }}"
|
||||||
|
when:
|
||||||
|
- uwsgi_nova_services | length > 0
|
||||||
tags:
|
tags:
|
||||||
- nova-config
|
- nova-config
|
||||||
- uwsgi
|
- uwsgi
|
||||||
|
@ -282,16 +286,23 @@
|
||||||
- nova-config
|
- nova-config
|
||||||
- systemd-service
|
- systemd-service
|
||||||
|
|
||||||
- import_tasks: nova_compute.yml
|
- include_tasks: nova_compute.yml
|
||||||
|
args:
|
||||||
|
apply:
|
||||||
|
tags:
|
||||||
|
- nova-compute
|
||||||
when:
|
when:
|
||||||
- nova_virt_type != 'ironic'
|
- nova_virt_type != 'ironic'
|
||||||
- "nova_services['nova-compute']['group'] in group_names"
|
- "nova_services['nova-compute']['group'] in group_names"
|
||||||
tags:
|
tags:
|
||||||
- nova-compute
|
- always
|
||||||
|
|
||||||
- name: Include ceph_client role
|
- name: Include ceph_client role
|
||||||
import_role:
|
include_role:
|
||||||
name: ceph_client
|
name: ceph_client
|
||||||
|
apply:
|
||||||
|
tags:
|
||||||
|
- ceph
|
||||||
vars:
|
vars:
|
||||||
openstack_service_system_user: "{{ nova_system_user_name }}"
|
openstack_service_system_user: "{{ nova_system_user_name }}"
|
||||||
openstack_service_venv_bin: "{{ (nova_install_method == 'source') | ternary(nova_bin, '') }}"
|
openstack_service_venv_bin: "{{ (nova_install_method == 'source') | ternary(nova_bin, '') }}"
|
||||||
|
@ -300,7 +311,7 @@
|
||||||
- nova_services['nova-compute']['group'] in group_names
|
- nova_services['nova-compute']['group'] in group_names
|
||||||
- (nova_rbd_inuse | bool) or (nova_glance_rbd_inuse | bool)
|
- (nova_rbd_inuse | bool) or (nova_glance_rbd_inuse | bool)
|
||||||
tags:
|
tags:
|
||||||
- ceph
|
- always
|
||||||
|
|
||||||
- name: Flush handlers
|
- name: Flush handlers
|
||||||
meta: flush_handlers
|
meta: flush_handlers
|
||||||
|
|
Loading…
Reference in New Issue