openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

Merge "Use ansible_facts[] rather than ansible_ variables"

This commit is contained in:
Zuul 2022-10-11 12:35:40 +00:00 committed by Gerrit Code Review
parent 748f239926 d42c065003
commit 9909da27c9
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tasks/neutron_install.yml
View File

@ -131,7 +131,7 @@
{%- endif -%}
{%- endfor -%}
{{ apparmor_hosts | unique }}
when: ansible_pkg_mgr == 'apt'
when: ansible_facts['pkg_mgr'] == 'apt'
- import_tasks: neutron_apparmor.yml
when:

2
vars/distro_install.yml
View File

@ -26,7 +26,7 @@ neutron_package_list: |-
{% set packages = neutron_distro_packages %}
{% if neutron_needs_openvswitch | bool %}
{% set _ = packages.extend(neutron_optional_ovs_distro_packages) %}
{% if (ovs_dpdk_support and ansible_pkg_mgr == 'apt') %}
{% if (ovs_dpdk_support and ansiblei_facts['pkg_mgr'] == 'apt') %}
{% set _ = packages.extend(neutron_ovs_dpdk_required_packages) %}
{% else %}
{% set _ = packages.extend(neutron_ovs_distro_packages) %}

2
vars/source_install.yml
View File

@ -25,7 +25,7 @@
neutron_package_list: |-
{% set packages = neutron_distro_packages %}
{% if neutron_needs_openvswitch | bool %}
{% if (ovs_dpdk_support and ansible_pkg_mgr == 'apt') %}
{% if (ovs_dpdk_support and ansible_facts['pkg_mgr'] == 'apt') %}
{% set _ = packages.extend(neutron_ovs_dpdk_required_packages) %}
{% else %}
{% set _ = packages.extend(neutron_ovs_distro_packages) %}