diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 83639d3..a10e8a0 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -89,7 +89,7 @@ jobs: - name: install ansible run: | - ansible-playbook -D playbooks/install-ansible.yml -e '{"virtualenv_packages":["_ansible==${{ matrix.ansible_version }}", "ansible-lint${{ matrix.ansible_lint_specifier }}", "_ansible_test", "flake8"]}' -e virtualenv_interpreter=python${{ matrix.python_version }} -t all,debug + ansible-playbook -D playbooks/install-ansible.yml -e '{"virtualenv_packages":["_ansible==${{ matrix.ansible_version }}", "ansible-lint${{ matrix.ansible_lint_specifier }}", "_ansible_test", "flake8"]}' -e virtualenv_python=python${{ matrix.python_version }} -t all,debug env: ANSIBLE_COLLECTIONS_PATHS: ../../.. diff --git a/playbooks/install-ansible.yml b/playbooks/install-ansible.yml index e8598ef..3a45bfa 100644 --- a/playbooks/install-ansible.yml +++ b/playbooks/install-ansible.yml @@ -7,4 +7,4 @@ roles: - role: mafalb.ansible.virtualenv virtualenv_packages: "{{ virtualenv_packages }}" - virtualenv_interpreter: "{{ virtualenv_interpreter if virtualenv_interpreter is defined else omit }}" + virtualenv_python: "{{ virtualenv_python if virtualenv_python is defined else omit }}" diff --git a/playbooks/install-molecule.yml b/playbooks/install-molecule.yml index f98b354..a80f3d1 100644 --- a/playbooks/install-molecule.yml +++ b/playbooks/install-molecule.yml @@ -8,7 +8,7 @@ # this is used if molecule_ansible_version is argument - role: mafalb.ansible.virtualenv virtualenv: ~/.virtualenvs/molecule # noqa var-naming[no-role-prefix] - virtualenv_interpreter: "{{ molecule_python_version|default('python3') }}" + virtualenv_python: "{{ molecule_python_version|default('python3') }}" virtualenv_packages: - _ansible=={{ molecule_ansible_version }} - ansible-lint @@ -20,7 +20,7 @@ # this is used if molecule_ansible_version is not argument - role: mafalb.ansible.virtualenv virtualenv: ~/.virtualenvs/molecule # noqa var-naming[no-role-prefix] - virtualenv_interpreter: "{{ molecule_python_version|default('python3') }}" + virtualenv_python: "{{ molecule_python_version|default('python3') }}" virtualenv_packages: - _ansible - ansible-lint diff --git a/roles/python/README.md b/roles/python/README.md index c108b24..e0901a7 100644 --- a/roles/python/README.md +++ b/roles/python/README.md @@ -9,6 +9,9 @@ |RHEL 8|python2|python3|python3| |Fedora|python2|python3|python3| +https://bugzilla.redhat.com/show_bug.cgi?id=1932650 +https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=2093589 + ## Basic Usage ```yaml diff --git a/roles/virtualenv/tasks/main/present.yml b/roles/virtualenv/tasks/main/present.yml index a4ab553..801c915 100644 --- a/roles/virtualenv/tasks/main/present.yml +++ b/roles/virtualenv/tasks/main/present.yml @@ -11,9 +11,9 @@ ansible.builtin.debug: var: __virtualenv - - name: Debug virtualenv_interpreter + - name: Debug virtualenv_python ansible.builtin.debug: - var: virtualenv_interpreter + var: virtualenv_python - name: Debug __virtualenv_interpreter ansible.builtin.debug: @@ -21,7 +21,7 @@ - name: Get info about targeted python interpreter mafalb.ansible.python_info: - executable: "{{ virtualenv_interpreter | default(ansible_python.executable) }}" + executable: "{{ virtualenv_python | default(ansible_python.executable) }}" register: __reg_targeted_python - name: Debug targeted python interpreter @@ -31,7 +31,7 @@ - name: Get OS specific variables with_first_found: # the following does not work. it is possible that the virtualenv does already exist. - # in that case, if no virtualenv_interpreter is given as argument, it could be + # in that case, if no virtualenv_python is given as argument, it could be # that the used interpreter in the existing virtualenv is different from the ansible python. # # - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}-\