Merge "use include_tasks instead of include"
This commit is contained in:
commit
5208f1bbbd
@ -24,26 +24,26 @@
|
||||
tags:
|
||||
- always
|
||||
|
||||
- include: ironic_pre_install.yml
|
||||
- include_tasks: ironic_pre_install.yml
|
||||
tags:
|
||||
- ironic-install
|
||||
|
||||
- include: ironic_install.yml
|
||||
- include_tasks: ironic_install.yml
|
||||
tags:
|
||||
- ironic-install
|
||||
|
||||
- include: ironic_oneview_setup.yml
|
||||
- include_tasks: ironic_oneview_setup.yml
|
||||
when: "'ironic-oneviewd' in (filtered_ironic_services | map(attribute='service_key') | list)"
|
||||
|
||||
- include: ironic_post_install.yml
|
||||
- include_tasks: ironic_post_install.yml
|
||||
tags:
|
||||
- ironic-config
|
||||
|
||||
- include: ironic_uwsgi.yml
|
||||
- include_tasks: ironic_uwsgi.yml
|
||||
tags:
|
||||
- ironic-config
|
||||
|
||||
- include: ironic_conductor_post_install.yml
|
||||
- include_tasks: ironic_conductor_post_install.yml
|
||||
when: "ironic_services['ironic-conductor']['group'] in group_names"
|
||||
tags:
|
||||
- ironic-config
|
||||
@ -67,16 +67,16 @@
|
||||
- common-mq
|
||||
- ironic-config
|
||||
|
||||
- include: ironic_db_setup.yml
|
||||
- include_tasks: ironic_db_setup.yml
|
||||
when: inventory_hostname == groups['ironic_conductor'][0]
|
||||
tags:
|
||||
- ironic-config
|
||||
|
||||
- include: "ironic_init_{{ ansible_service_mgr }}.yml"
|
||||
- include_tasks: "ironic_init_{{ ansible_service_mgr }}.yml"
|
||||
tags:
|
||||
- ironic-config
|
||||
|
||||
- include: ironic_service_setup.yml
|
||||
- include_tasks: ironic_service_setup.yml
|
||||
when: inventory_hostname == groups['ironic_api'][0]
|
||||
tags:
|
||||
- ironic-config
|
||||
|
@ -14,35 +14,35 @@
|
||||
# limitations under the License.
|
||||
|
||||
# Setup the host
|
||||
- include: common/test-setup-host.yml
|
||||
- import_playbook: common/test-setup-host.yml
|
||||
|
||||
# Install RabbitMQ/MariaDB
|
||||
- include: common/test-install-infra.yml
|
||||
- import_playbook: common/test-install-infra.yml
|
||||
|
||||
# Install Keystone
|
||||
- include: common/test-install-keystone.yml
|
||||
- import_playbook: common/test-install-keystone.yml
|
||||
|
||||
# Install Swift
|
||||
- include: common/test-install-swift.yml
|
||||
- import_playbook: common/test-install-swift.yml
|
||||
|
||||
# Install Glance
|
||||
- include: common/test-install-glance.yml
|
||||
- import_playbook: common/test-install-glance.yml
|
||||
|
||||
# Install Neutron
|
||||
- include: common/test-install-neutron.yml
|
||||
- import_playbook: common/test-install-neutron.yml
|
||||
|
||||
# Install Nova
|
||||
- include: common/test-install-nova.yml
|
||||
- import_playbook: common/test-install-nova.yml
|
||||
|
||||
# Configure Ironic
|
||||
- include: test-configure-ironic.yml
|
||||
- import_playbook: test-configure-ironic.yml
|
||||
|
||||
# Install Ironic
|
||||
- include: common/test-install-ironic.yml
|
||||
- import_playbook: common/test-install-ironic.yml
|
||||
|
||||
# Test REST API
|
||||
- include: test-rest-api.yml
|
||||
- import_playbook: test-rest-api.yml
|
||||
|
||||
# Test the ironicclient CLI
|
||||
# Omitted for now, unclear purpose
|
||||
- include: test-ironic-cli.yml
|
||||
- import_playbook: test-ironic-cli.yml
|
||||
|
Loading…
Reference in New Issue
Block a user