openstack
/
openstack-ansible-ceph_client
Code Issues Proposed changes

Ensure python libs are linked to service venvs consistently 

Several different libraries are linked and some had hardcoded python2.7
paths, which are now auto-detected.

In addition, the detected python interpreter is always used rather than
sometimes being hardcoded to 'python'.

Change-Id: Ibe512c614e1a830b7b160e45c970b953a4d08e23
This commit is contained in:
Jonathan Rosser 2019-09-07 19:32:45 +01:00
parent 6760f6bd84
commit 31cf98b69a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasks/ceph_install_python_libs.yml
View File

@ -37,19 +37,19 @@
register: rbd_module_path
- name: Register cephfs module path
command: python -c 'import cephfs; print cephfs.__file__'
command: "{{ ceph_python_interp }} -c 'import cephfs; print cephfs.__file__'"
changed_when: false
failed_when: false
register: cephfs_module_path
- name: Register ceph_volume_client path
command: python -c 'import ceph_volume_client; print ceph_volume_client.__file__'
command: "{{ ceph_python_interp }} -c 'import ceph_volume_client; print ceph_volume_client.__file__'"
changed_when: false
failed_when: false
register: ceph_volume_client_module_path
- name: Register ceph_argparse path
command: python -c 'import ceph_argparse; print ceph_argparse.__file__'
command: "{{ ceph_python_interp }} -c 'import ceph_argparse; print ceph_argparse.__file__'"
changed_when: false
failed_when: false
register: ceph_argparse_module_path
@ -75,7 +75,7 @@
- name: Link cephfs module into the venv
file:
src: "{{ cephfs_module_path.stdout | replace('.pyc', '.py') }}"
dest: "{{ openstack_service_venv_bin | dirname }}/lib/python2.7/site-packages/{{ cephfs_module_path.stdout | basename | replace('.pyc', '.py') }}"
dest: "{{ venv_python_lib_folder }}//site-packages/{{ cephfs_module_path.stdout | basename | replace('.pyc', '.py') }}"
state: link
force: "yes"
when:
@ -86,7 +86,7 @@
- name: Link ceph_volume_client module into the venv
file:
src: "{{ ceph_volume_client_module_path.stdout | replace('.pyc', '.py') }}"
dest: "{{ openstack_service_venv_bin | dirname }}/lib/python2.7/site-packages/{{ ceph_volume_client_module_path.stdout | basename | replace('.pyc', '.py') }}"
dest: "{{ venv_python_lib_folder }}/site-packages/{{ ceph_volume_client_module_path.stdout | basename | replace('.pyc', '.py') }}"
state: link
force: "yes"
when:
@ -97,7 +97,7 @@
- name: Link ceph_argparse module into the venv
file:
src: "{{ ceph_argparse_module_path.stdout | replace('.pyc', '.py') }}"
dest: "{{ openstack_service_venv_bin | dirname }}/lib/python2.7/site-packages/{{ ceph_argparse_module_path.stdout | basename | replace('.pyc', '.py') }}"
dest: "{{ venv_python_lib_folder }}/site-packages/{{ ceph_argparse_module_path.stdout | basename | replace('.pyc', '.py') }}"
state: link
force: "yes"
when: