openstack/openstack-ansible-plugins
Code Issues Proposed changes

Combine vars files for debian/ubuntu and ensure setuptools is present

Browse Source 
The packages for glusterfs are the same in recent ubuntu/debian
distros so the vars files can be combined.

distutils is deprecated under pep-632, but can be provided via
installing python3-setuptools. distutils is imported by modules
in the glusterfs collection, so we need this to be available.

Change-Id: Ic21ff02c67912f873a25dfe35badbdcbd42a4997
This commit is contained in:
Jonathan Rosser 2024-07-23 07:14:00 +01:00 committed by Dmitriy Rabotyagov
parent 52c710ae91
commit 82d1304de4
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/glusterfs/vars/debian.yml
View File

@ -14,4 +14,6 @@
# limitations under the License.
glusterfs_server_distro_packages:
- python3-setuptools # required for gluster ansible collection
- glusterfs-cli
- glusterfs-server

18
roles/glusterfs/vars/ubuntu-22.04.yml
View File

@ -1,18 +0,0 @@
---
# Copyright 2022, BBC R&D
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
glusterfs_server_distro_packages:
- glusterfs-server
- glusterfs-cli