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: I796d9de164a8b79eff8a615442dd46e7de2353e7
This commit is contained in:
parent
b69068bcc2
commit
13ac3d38ee
@ -211,7 +211,6 @@ cinder_osapi_volume_workers: "{{ [[(ansible_facts['processor_vcpus']//ansible_fa
|
|||||||
cinder_target_helper_mapping:
|
cinder_target_helper_mapping:
|
||||||
RedHat: lioadm
|
RedHat: lioadm
|
||||||
Debian: tgtadm
|
Debian: tgtadm
|
||||||
Suse: tgtadm
|
|
||||||
cinder_target_helper: "{{ cinder_target_helper_mapping[ansible_facts['os_family']] }}"
|
cinder_target_helper: "{{ cinder_target_helper_mapping[ansible_facts['os_family']] }}"
|
||||||
cinder_iscsi_iotype: fileio
|
cinder_iscsi_iotype: fileio
|
||||||
cinder_iscsi_num_targets: 100
|
cinder_iscsi_num_targets: 100
|
||||||
|
@ -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: "{{ cinder_package_list }}"
|
name: "{{ cinder_package_list }}"
|
||||||
state: "{{ cinder_package_state }}"
|
state: "{{ cinder_package_state }}"
|
||||||
update_cache: "{{ (ansible_facts['pkg_mgr'] in ['apt', 'zypper']) | ternary('yes', omit) }}"
|
update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
|
||||||
cache_valid_time: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary(cache_timeout, omit) }}"
|
cache_valid_time: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary(cache_timeout, omit) }}"
|
||||||
register: install_packages
|
register: install_packages
|
||||||
until: install_packages is success
|
until: install_packages is success
|
||||||
|
@ -182,7 +182,7 @@
|
|||||||
package:
|
package:
|
||||||
name: "{{ cinder_volume_distro_packages_tools }}"
|
name: "{{ cinder_volume_distro_packages_tools }}"
|
||||||
state: "{{ cinder_package_state }}"
|
state: "{{ cinder_package_state }}"
|
||||||
update_cache: "{{ (ansible_facts['pkg_mgr'] in ['apt', 'zypper']) | ternary('yes', omit) }}"
|
update_cache: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary('yes', omit) }}"
|
||||||
cache_valid_time: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary(cache_timeout, omit) }}"
|
cache_valid_time: "{{ (ansible_facts['pkg_mgr'] == 'apt') | ternary(cache_timeout, omit) }}"
|
||||||
register: install_packages
|
register: install_packages
|
||||||
until: install_packages is success
|
until: install_packages is success
|
||||||
|
@ -26,7 +26,7 @@ cinder_distro_packages:
|
|||||||
|
|
||||||
cinder_service_distro_packages:
|
cinder_service_distro_packages:
|
||||||
- openstack-cinder
|
- openstack-cinder
|
||||||
- "{{ ansible_facts['distribution_major_version'] is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}"
|
- python3-systemd
|
||||||
|
|
||||||
cinder_devel_distro_packages:
|
cinder_devel_distro_packages:
|
||||||
- git
|
- git
|
||||||
@ -41,7 +41,7 @@ cinder_api_distro_packages: []
|
|||||||
cinder_volume_service_distro_packages: []
|
cinder_volume_service_distro_packages: []
|
||||||
|
|
||||||
cinder_volume_distro_packages_tools:
|
cinder_volume_distro_packages_tools:
|
||||||
- "qemu-img{% if ansible_facts['distribution_major_version']|int <= 7 %}-ev{% endif %}"
|
- qemu-img
|
||||||
|
|
||||||
cinder_volume_distro_packages:
|
cinder_volume_distro_packages:
|
||||||
- iscsi-initiator-utils
|
- iscsi-initiator-utils
|
||||||
|
@ -1,69 +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.
|
|
||||||
|
|
||||||
# service names
|
|
||||||
tgt_service_name: tgtd
|
|
||||||
|
|
||||||
# Common yum packages
|
|
||||||
cinder_distro_packages:
|
|
||||||
- libkmod2
|
|
||||||
- libxslt1
|
|
||||||
|
|
||||||
cinder_service_distro_packages:
|
|
||||||
- openstack-cinder-scheduler
|
|
||||||
- python3-openstackclient
|
|
||||||
- python3-shade
|
|
||||||
|
|
||||||
cinder_api_distro_packages:
|
|
||||||
- openstack-cinder-api
|
|
||||||
|
|
||||||
cinder_devel_distro_packages:
|
|
||||||
- git-core
|
|
||||||
- libxslt-devel
|
|
||||||
- libkmod-devel
|
|
||||||
- postgresql-devel
|
|
||||||
- systemd-devel
|
|
||||||
- zlib-devel
|
|
||||||
|
|
||||||
cinder_volume_service_distro_packages:
|
|
||||||
- openstack-cinder-volume
|
|
||||||
|
|
||||||
cinder_volume_distro_packages_tools:
|
|
||||||
- qemu-tools
|
|
||||||
|
|
||||||
cinder_volume_distro_packages:
|
|
||||||
- open-iscsi
|
|
||||||
- nfs-utils
|
|
||||||
- rpcbind
|
|
||||||
|
|
||||||
cinder_lvm_volume_distro_packages:
|
|
||||||
- device-mapper
|
|
||||||
- lvm2
|
|
||||||
- parted
|
|
||||||
- tgt
|
|
||||||
|
|
||||||
cinder_backup_service_distro_packages:
|
|
||||||
- openstack-cinder-backup
|
|
||||||
|
|
||||||
cinder_backup_distro_packages:
|
|
||||||
- open-iscsi
|
|
||||||
- nfs-utils
|
|
||||||
- rpcbind
|
|
||||||
|
|
||||||
cinder_oslomsg_amqp1_distro_packages:
|
|
||||||
- cyrus-sasl
|
|
||||||
- cyrus-sasl-plain
|
|
||||||
- cyrus-sasl-digestmd5
|
|
Loading…
Reference in New Issue
Block a user