diff --git a/defaults/main.yml b/defaults/main.yml index 898b44aa..e21edc6e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -162,7 +162,6 @@ octavia_requires_pip_packages: - python-keystoneclient # Keystoneclient needed to OSA keystone lib - shade - virtualenv - - virtualenv-tools - python-openstackclient # Common pip packages diff --git a/tasks/octavia_install.yml b/tasks/octavia_install.yml index 04f66cad..0edd40b4 100644 --- a/tasks/octavia_install.yml +++ b/tasks/octavia_install.yml @@ -111,11 +111,14 @@ - octavia_get_venv | changed or octavia_venv_dir | changed - name: Update virtualenv path - command: > - virtualenv-tools --update-path=auto --reinitialize {{ octavia_bin | dirname }} + shell: | + find {{ octavia_bin }} -name \*.pyc -delete + sed -si '1s/^.*python.*$/#!{{ octavia_bin | replace ('/','\/') }}\/python/' {{ octavia_bin }}/* when: - not octavia_developer_mode | bool - octavia_get_venv | changed or octavia_venv_dir | changed + tags: + - skip_ansible_lint - name: Record the venv tag deployed ini_file: