From d7e769d2b1d62467478db98e6d06c65eb9720ba2 Mon Sep 17 00:00:00 2001 From: Pratik Bandarkar Date: Thu, 20 Jun 2024 14:52:51 +0100 Subject: [PATCH] Revert the change which got injected during merge --- playbooks/common-tasks/maas-venv-create.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playbooks/common-tasks/maas-venv-create.yml b/playbooks/common-tasks/maas-venv-create.yml index ad369c62..b13bf7f1 100644 --- a/playbooks/common-tasks/maas-venv-create.yml +++ b/playbooks/common-tasks/maas-venv-create.yml @@ -72,7 +72,7 @@ pip: name: - pip - - setuptools<45 + - "{%- if ansible_python.version.major == 2 -%}setuptools<45{% else %}setuptools{% endif %}" extra_args: >- -U --isolated {{ pip_install_options | default('') }} @@ -93,7 +93,7 @@ venv_pip_packages: "{{ venv_pip_packages | union(maas_pip_lxc_packages) }}" when: - not (ansible_local['maas']['general']['deploy_osp'] | bool) - - ansible_local['maas']['general']['maas_lxc_host'] | bool + - ansible_local['maas']['general']['maas_lxc_host'] | default(False) | bool - name: Include docker pip packages set_fact: