openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Replace virtualenv-tools by a script"

Browse Source
This commit is contained in:
Zuul
2018-01-16 13:24:18 +00:00
committed by Gerrit Code Review
parent a7b4d86599 d5ad55cf4c
commit 0f26b461f8
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
defaults/main.yml
View File

@@ -316,7 +316,6 @@ swift_do_sync: True
# swift packages that must be installed before anything else # swift packages that must be installed before anything else
swift_requires_pip_packages: swift_requires_pip_packages:
- virtualenv - virtualenv
- virtualenv-tools
- python-keystoneclient # Keystoneclient needed to OSA keystone lib - python-keystoneclient # Keystoneclient needed to OSA keystone lib
- httplib2 - httplib2

7
tasks/swift_install.yml
View File

@@ -112,9 +112,12 @@
- swift_get_venv | changed - swift_get_venv | changed
- name: Update virtualenv path - name: Update virtualenv path
command: > shell: |
virtualenv-tools --update-path=auto --reinitialize {{ swift_bin | dirname }} find {{ swift_bin }} -name \*.pyc -delete
sed -si '1s/^.*python.*$/#!{{ swift_bin | replace ('/','\/') }}\/python/' {{ swift_bin }}/*
when: swift_get_venv | changed when: swift_get_venv | changed
tags:
- skip_ansible_lint
- include: swift_pypy_setup.yml - include: swift_pypy_setup.yml
static: no static: no