Remove references to unsupported operating systems
All references to Gentoo, SUSE, Debian stretch and Centos-7 are removed. Conditional tasks, ternary operators and variables are simplified where possible OS specific variables files are generalised where possible Change-Id: I30e528914092c5c4df081031045e3d2f2e949bfd
This commit is contained in:
parent
3c16888e1a
commit
a1205ca3a9
@ -22,17 +22,14 @@ galaxy_info:
|
|||||||
platforms:
|
platforms:
|
||||||
- name: Debian
|
- name: Debian
|
||||||
versions:
|
versions:
|
||||||
- stretch
|
- buster
|
||||||
- name: Ubuntu
|
- name: Ubuntu
|
||||||
versions:
|
versions:
|
||||||
- xenial
|
|
||||||
- bionic
|
- bionic
|
||||||
|
- focal
|
||||||
- name: EL
|
- name: EL
|
||||||
versions:
|
versions:
|
||||||
- 7
|
- 8
|
||||||
- name: opensuse
|
|
||||||
versions:
|
|
||||||
- 15
|
|
||||||
categories:
|
categories:
|
||||||
- cloud
|
- cloud
|
||||||
- python
|
- python
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
package:
|
package:
|
||||||
name: "{{ swift_package_list }}"
|
name: "{{ swift_package_list }}"
|
||||||
state: "{{ swift_package_state }}"
|
state: "{{ swift_package_state }}"
|
||||||
update_cache: "{{ (ansible_pkg_mgr in ['apt', 'zypper']) | ternary('yes', omit) }}"
|
update_cache: "{{ (ansible_pkg_mgr == 'apt') | ternary('yes', omit) }}"
|
||||||
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
|
cache_valid_time: "{{ (ansible_pkg_mgr == 'apt') | ternary(cache_timeout, omit) }}"
|
||||||
register: install_packages
|
register: install_packages
|
||||||
until: install_packages is success
|
until: install_packages is success
|
||||||
|
@ -19,7 +19,7 @@ swift_distro_packages:
|
|||||||
- liberasurecode
|
- liberasurecode
|
||||||
- openssh-server
|
- openssh-server
|
||||||
- openssh-clients
|
- openssh-clients
|
||||||
- "{{ ansible_distribution_major_version is version('8', '<') | ternary('rsync', 'rsync-daemon') }}"
|
- rsync-daemon
|
||||||
|
|
||||||
swift_devel_distro_packages:
|
swift_devel_distro_packages:
|
||||||
- git
|
- git
|
||||||
@ -30,9 +30,9 @@ swift_devel_distro_packages:
|
|||||||
|
|
||||||
swift_service_distro_packages:
|
swift_service_distro_packages:
|
||||||
- openstack-swift
|
- openstack-swift
|
||||||
- "{{ ansible_distribution_major_version is version('8', '<') | ternary('python-keystonemiddleware', 'python3-keystonemiddleware') }}"
|
- python3-keystonemiddleware
|
||||||
- "{{ ansible_distribution_major_version is version('8', '<') | ternary('python-memcached', 'python3-memcached') }}"
|
- python3-memcached
|
||||||
- "{{ ansible_distribution_major_version is version('8', '<') | ternary('python-swift', 'python3-swift') }}"
|
- python3-swift
|
||||||
|
|
||||||
swift_account_distro_packages:
|
swift_account_distro_packages:
|
||||||
- openstack-swift-account
|
- openstack-swift-account
|
||||||
|
@ -1,48 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2016, Rackspace US, Inc.
|
|
||||||
# Copyright 2017, SUSE LINUX GmbH.
|
|
||||||
#
|
|
||||||
# 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.
|
|
||||||
|
|
||||||
swift_distro_packages:
|
|
||||||
- cron
|
|
||||||
- liberasurecode1
|
|
||||||
- openssh
|
|
||||||
- rsync
|
|
||||||
|
|
||||||
swift_devel_distro_packages:
|
|
||||||
- git-core
|
|
||||||
- liberasurecode-devel
|
|
||||||
- libffi-devel
|
|
||||||
- libopenssl-devel
|
|
||||||
- systemd-devel
|
|
||||||
|
|
||||||
swift_service_distro_packages:
|
|
||||||
- openstack-swift
|
|
||||||
- python-python-memcached
|
|
||||||
|
|
||||||
swift_account_distro_packages:
|
|
||||||
- openstack-swift-account
|
|
||||||
|
|
||||||
swift_container_distro_packages:
|
|
||||||
- openstack-swift-container
|
|
||||||
|
|
||||||
swift_object_distro_packages:
|
|
||||||
- openstack-swift-object
|
|
||||||
|
|
||||||
swift_proxy_distro_packages:
|
|
||||||
- openstack-swift-proxy
|
|
||||||
|
|
||||||
swift_rsync_service_name: rsyncd
|
|
||||||
|
|
||||||
swift_sshd: sshd
|
|
Loading…
Reference in New Issue
Block a user