Browse Source

Merge "Only replace python when re-initializing the venv" into stable/queens

tags/17.0.3^0
Zuul Gerrit Code Review 1 year ago
parent
commit
780d8d477c
1 changed files with 12 additions and 1 deletions
  1. +12
    -1
      tasks/ceilometer_install.yml

+ 12
- 1
tasks/ceilometer_install.yml View File

@@ -124,11 +124,22 @@
- ansible_pkg_mgr in ['yum', 'dnf', 'zypper']
- ceilometer_get_venv | changed

# NOTE(odyssey4me):
# We reinitialize the venv to ensure that the right
# version of python is in the venv, but we do not
# want virtualenv to also replace pip, setuptools
# and wheel so we tell it not to.
# We do not use --always-copy for CentOS/SuSE due
# to https://github.com/pypa/virtualenv/issues/565
- name: Update virtualenv path
shell: |
find {{ ceilometer_bin }} -name \*.pyc -delete
sed -si '1s/^.*python.*$/#!{{ ceilometer_bin | replace ('/','\/') }}\/python/' {{ ceilometer_bin }}/*
virtualenv {{ ceilometer_bin | dirname }}
virtualenv {{ ceilometer_bin | dirname }} \
{{ (ansible_pkg_mgr == 'apt') | ternary('--always-copy', '') }} \
--no-pip \
--no-setuptools \
--no-wheel
when: ceilometer_get_venv | changed
tags:
- skip_ansible_lint


Loading…
Cancel
Save