Merge "Get ceilometer_lib_dir in more reliable way"

defaults/main.yml

@@ -29,7 +29,7 @@ ceilometer_pip_package_state: "latest"
 
 # Set installation method.
 ceilometer_install_method: "source"
-ceilometer_venv_python_executable: "{{ openstack_venv_python_executable | default('python2') }}"
+ceilometer_venv_python_executable: "{{ _ceilometer_venv_python_executable }}"
 
 ## The git source/branch
 ceilometer_git_repo: https://opendev.org/openstack/ceilometer

tasks/ceilometer_install.yml

@@ -53,17 +53,3 @@
         option: "venv_tag"
         value: "{{ ceilometer_venv_tag }}"
   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'

tasks/ceilometer_post_install.yml

@@ -13,6 +13,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+- name: Find the venv's python version
+  command: "{{ ceilometer_bin }}/{{ ceilometer_venv_python_executable }} -c 'import ceilometer; print(ceilometer.__file__)'"
+  changed_when: false
+  register: _ceilometer_python_venv_details
+
+- name: Set python lib dir fact
+  set_fact:
+    ceilometer_lib_dir: "{{ _ceilometer_python_venv_details.stdout | dirname | dirname }}"
+
 - name: Copy ceilometer configuration files
   config_template:
     content: "{{ item.content | default(omit) }}"

vars/debian.yml

@@ -41,5 +41,3 @@ ceilometer_oslomsg_amqp1_distro_packages:
 ceilometer_packages_to_symlink:
   - python-libvirt
   - python3-libvirt
-
-ceilometer_lib_dir: "/usr/lib/python3/dist-packages"

vars/distro_install.yml

@@ -21,3 +21,5 @@ ceilometer_package_list: |-
   {{ packages }}
 
 _ceilometer_bin: "/usr/bin"
+
+_ceilometer_venv_python_executable: "{{ ((ansible_os_family | lower == 'redhat') and (ansible_distribution_major_version is version('7', '='))) | ternary('python2', 'python3') }}"

vars/redhat-7.yml

@@ -45,5 +45,3 @@ ceilometer_packages_to_symlink: |-
 
 ceilometer_extra_pip_packages:
   - libvirt-python
-
-ceilometer_lib_dir: "/usr/lib/python2.7/site-packages"

vars/source_install.yml

@@ -25,3 +25,5 @@ _ceilometer_bin: "/openstack/venvs/ceilometer-{{ ceilometer_venv_tag }}/bin"
 #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"
+
+_ceilometer_venv_python_executable: "{{ openstack_venv_python_executable | default('python2') }}"

vars/suse.yml

@@ -44,5 +44,3 @@ ceilometer_oslomsg_amqp1_distro_packages:
 ceilometer_packages_to_symlink:
   - python2-libvirt-python
   - python3-libvirt-python
-
-ceilometer_lib_dir: "/usr/lib/python2.7/site-packages"