Merge "Add python3 compatibility for source installs"
This commit is contained in:
commit
fa5727c090
@ -53,3 +53,17 @@
|
|||||||
option: "venv_tag"
|
option: "venv_tag"
|
||||||
value: "{{ ceilometer_venv_tag }}"
|
value: "{{ ceilometer_venv_tag }}"
|
||||||
when: ceilometer_install_method == 'source'
|
when: ceilometer_install_method == 'source'
|
||||||
|
|
||||||
|
- name: Find the venv's python version
|
||||||
|
find:
|
||||||
|
paths: "{{ ceilometer_bin | dirname }}/lib/"
|
||||||
|
patterns: "python*"
|
||||||
|
file_type: directory
|
||||||
|
recurse: no
|
||||||
|
register: _ceilometer_python_venv_details
|
||||||
|
when: ceilometer_install_method == 'source'
|
||||||
|
|
||||||
|
- name: Set python lib dir fact
|
||||||
|
set_fact:
|
||||||
|
ceilometer_lib_dir: "{{ _ceilometer_python_venv_details.files[0].path }}/site-packages"
|
||||||
|
when: ceilometer_install_method == 'source'
|
||||||
|
@ -22,4 +22,6 @@ ceilometer_package_list: |-
|
|||||||
|
|
||||||
_ceilometer_bin: "/openstack/venvs/ceilometer-{{ ceilometer_venv_tag }}/bin"
|
_ceilometer_bin: "/openstack/venvs/ceilometer-{{ ceilometer_venv_tag }}/bin"
|
||||||
|
|
||||||
ceilometer_lib_dir: "{{ _ceilometer_bin | dirname }}/lib/python2.7/site-packages"
|
#NOTE(jrosser) for compatibility with py2 and py3 we detect the location of
|
||||||
|
#this dir during the source install and set a fact
|
||||||
|
#ceilometer_lib_dir: "{{ _ceilometer_bin | dirname }}/lib/python2.7/site-packages"
|
||||||
|
@ -16,7 +16,8 @@
|
|||||||
|
|
||||||
ceilometer_distro_packages:
|
ceilometer_distro_packages:
|
||||||
- git-core
|
- git-core
|
||||||
- "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('libvirt-python', 'python2-libvirt-python') }}"
|
- python2-libvirt-python
|
||||||
|
- python3-libvirt-python
|
||||||
|
|
||||||
ceilometer_devel_distro_packages:
|
ceilometer_devel_distro_packages:
|
||||||
- pkg-config
|
- pkg-config
|
||||||
@ -41,6 +42,7 @@ ceilometer_oslomsg_amqp1_distro_packages:
|
|||||||
- cyrus-sasl-digestmd5
|
- cyrus-sasl-digestmd5
|
||||||
|
|
||||||
ceilometer_packages_to_symlink:
|
ceilometer_packages_to_symlink:
|
||||||
- "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('libvirt-python', 'python2-libvirt-python') }}"
|
- python2-libvirt-python
|
||||||
|
- python3-libvirt-python
|
||||||
|
|
||||||
ceilometer_lib_dir: "/usr/lib/python2.7/site-packages"
|
ceilometer_lib_dir: "/usr/lib/python2.7/site-packages"
|
||||||
|
Loading…
Reference in New Issue
Block a user