openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Refactor pre-install checks into neutron_check.yml"

This commit is contained in:
Zuul 2018-11-10 11:39:38 +00:00 committed by Gerrit Code Review
parent 74247e24a7 dfce6dba6e
commit ffa057d9b8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasks/main.yml
View File

@ -27,16 +27,6 @@
tags:
- always
- name: Fail if service was deployed using a different installation method
fail:
msg: "Switching installation methods for OpenStack services is not supported"
when:
- ansible_local is defined
- ansible_local.openstack_ansible is defined
- ansible_local.openstack_ansible.neutron is defined
- ansible_local.openstack_ansible.neutron.install_method is defined
- ansible_local.openstack_ansible.neutron.install_method != neutron_install_method
- name: Gather variables for installation method
include_vars: "{{ neutron_install_method }}_install.yml"
tags:

10
tasks/neutron_check.yml
View File

@ -21,3 +21,13 @@
when:
- neutron_fwaas | bool
- neutron_fwaas_v2 | bool
- name: Fail if service was deployed using a different installation method
fail:
msg: "Switching installation methods for OpenStack services is not supported"
when:
- ansible_local is defined
- ansible_local.openstack_ansible is defined
- ansible_local.openstack_ansible.neutron is defined
- ansible_local.openstack_ansible.neutron.install_method is defined
- ansible_local.openstack_ansible.neutron.install_method != neutron_install_method