openstack/openstack-ansible-os_gnocchi
Code Issues Proposed changes

Do not provide ceph_alternative extra for ceph

Browse Source 
When adding ceph_alternative in pip extras, pip tries to install
python-rados which is not available from pypi and this fails installation
We symlink all required packages inside venv with ceph_client role so
providing ceph_alternative as extras makes no sense.

Change-Id: If4103a28235b0127b5e2220577a7cd2451154c1d
This commit is contained in:
Dmitriy Rabotyagov 2021-11-11 10:36:13 +02:00
parent b9d2f805e3
commit 2938fadcf3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vars/main.yml
View File

@ -25,15 +25,15 @@ gnocchi_api_paste_default_content: |
gnocchi_policy_default_content: |
{{ _git_file_fetch.results | selectattr('item', 'equalto', gnocchi_git_config_lookup_location ~ '/' ~ gnocchi_policy_git_file_path) | map(attribute='content') | first }}
# NOTE(noonedeadpunk): We prefer using ceph_alternative when storage driver is ceph.
# However, if we define ceph_alternative here, gnocchi with setup.cfg
# will attempt to install python-rados which is not available from pypi
# anyway. We symlink required package with ceph_client role.
gnocchi_storage_driver_pip_extra: |-
{% if gnocchi_storage_driver == 'ceph' %}
{% set extra_package = 'ceph_alternative' %}
{% elif gnocchi_storage_driver == 'file' %}
{% set extra_package = '' %}
{% else %}
{% if gnocchi_storage_driver not in ['ceph', 'file'] %}
{% set extra_package = gnocchi_storage_driver %}
{% endif %}
{{ extra_package }}
{{ extra_package | default('') }}
filtered_gnocchi_services: |-
{% set services = [] %}