openstack/kolla-ansible
Code Issues Proposed changes

Merge "Move the ironic-check action into prechecks.yml"

Browse Source
This commit is contained in:
Zuul 2018-09-21 15:59:11 +00:00 committed by Gerrit Code Review
commit 2ca6f89d8e
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/neutron/tasks/deploy.yml
View File

@ -1,6 +1,4 @@
--- ---
- include_tasks: ironic-check.yml
- include_tasks: register.yml - include_tasks: register.yml
when: inventory_hostname in groups['neutron-server'] when: inventory_hostname in groups['neutron-server']

5
ansible/roles/neutron/tasks/ironic-check.yml
View File

@ -1,5 +0,0 @@
---
- fail: msg="Ironic must be enabled when using networking-baremetal/ironic-neutron-agent"
when:
- enable_ironic_neutron_agent | bool
- not (enable_ironic | bool)

8
ansible/roles/neutron/tasks/precheck.yml
View File

@ -57,3 +57,11 @@
when: when:
- (groups['inner-compute'] | default([]) | length > 0 - (groups['inner-compute'] | default([]) | length > 0
or groups['external-compute'] | default([]) | length > 0) or groups['external-compute'] | default([]) | length > 0)
- name: Checking whether Ironic enabled
local_action: fail msg="Ironic must be enabled when using networking-baremetal/ironic-neutron-agent"
changed_when: false
run_once: True
when:
- enable_ironic_neutron_agent | bool
- not (enable_ironic | bool)