From d42c0650036aa5258d44e753aa7c175e060f2933 Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Wed, 5 Oct 2022 18:12:50 +0100 Subject: [PATCH] Use ansible_facts[] rather than ansible_ variables Change-Id: Idd4bd35e1bbeb30b9dfa8c9b7a39acfd14bfd6ac --- tasks/neutron_install.yml | 2 +- vars/distro_install.yml | 2 +- vars/source_install.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/neutron_install.yml b/tasks/neutron_install.yml index b5fa34bf..19a697fb 100644 --- a/tasks/neutron_install.yml +++ b/tasks/neutron_install.yml @@ -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: diff --git a/vars/distro_install.yml b/vars/distro_install.yml index ace5dd12..8e52a0cb 100644 --- a/vars/distro_install.yml +++ b/vars/distro_install.yml @@ -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) %} diff --git a/vars/source_install.yml b/vars/source_install.yml index 819286cb..5dea3c86 100644 --- a/vars/source_install.yml +++ b/vars/source_install.yml @@ -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) %}