openstack/openstack-ansible-os_ironic
Code Issues Proposed changes

Merge "use include_tasks instead of include"

Browse Source
This commit is contained in:
Zuul 2018-08-13 08:33:40 +00:00 committed by Gerrit Code Review
commit 5208f1bbbd
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tasks/main.yml
View File

@ -24,26 +24,26 @@
tags: tags:
- always - always
- include: ironic_pre_install.yml - include_tasks: ironic_pre_install.yml
tags: tags:
- ironic-install - ironic-install
- include: ironic_install.yml - include_tasks: ironic_install.yml
tags: tags:
- ironic-install - 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)" when: "'ironic-oneviewd' in (filtered_ironic_services | map(attribute='service_key') | list)"
- include: ironic_post_install.yml - include_tasks: ironic_post_install.yml
tags: tags:
- ironic-config - ironic-config
- include: ironic_uwsgi.yml - include_tasks: ironic_uwsgi.yml
tags: tags:
- ironic-config - ironic-config
- include: ironic_conductor_post_install.yml - include_tasks: ironic_conductor_post_install.yml
when: "ironic_services['ironic-conductor']['group'] in group_names" when: "ironic_services['ironic-conductor']['group'] in group_names"
tags: tags:
- ironic-config - ironic-config
@ -67,16 +67,16 @@
- common-mq - common-mq
- ironic-config - ironic-config
- include: ironic_db_setup.yml - include_tasks: ironic_db_setup.yml
when: inventory_hostname == groups['ironic_conductor'][0] when: inventory_hostname == groups['ironic_conductor'][0]
tags: tags:
- ironic-config - ironic-config
- include: "ironic_init_{{ ansible_service_mgr }}.yml" - include_tasks: "ironic_init_{{ ansible_service_mgr }}.yml"
tags: tags:
- ironic-config - ironic-config
- include: ironic_service_setup.yml - include_tasks: ironic_service_setup.yml
when: inventory_hostname == groups['ironic_api'][0] when: inventory_hostname == groups['ironic_api'][0]
tags: tags:
- ironic-config - ironic-config

22
tests/test.yml
View File

@ -14,35 +14,35 @@
# limitations under the License. # limitations under the License.
# Setup the host # Setup the host
- include: common/test-setup-host.yml - import_playbook: common/test-setup-host.yml
# Install RabbitMQ/MariaDB # Install RabbitMQ/MariaDB
- include: common/test-install-infra.yml - import_playbook: common/test-install-infra.yml
# Install Keystone # Install Keystone
- include: common/test-install-keystone.yml - import_playbook: common/test-install-keystone.yml
# Install Swift # Install Swift
- include: common/test-install-swift.yml - import_playbook: common/test-install-swift.yml
# Install Glance # Install Glance
- include: common/test-install-glance.yml - import_playbook: common/test-install-glance.yml
# Install Neutron # Install Neutron
- include: common/test-install-neutron.yml - import_playbook: common/test-install-neutron.yml
# Install Nova # Install Nova
- include: common/test-install-nova.yml - import_playbook: common/test-install-nova.yml
# Configure Ironic # Configure Ironic
- include: test-configure-ironic.yml - import_playbook: test-configure-ironic.yml
# Install Ironic # Install Ironic
- include: common/test-install-ironic.yml - import_playbook: common/test-install-ironic.yml
# Test REST API # Test REST API
- include: test-rest-api.yml - import_playbook: test-rest-api.yml
# Test the ironicclient CLI # Test the ironicclient CLI
# Omitted for now, unclear purpose # Omitted for now, unclear purpose
- include: test-ironic-cli.yml - import_playbook: test-ironic-cli.yml