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: Ia73e88947f52a74d9c03a17a7b1201a6346b5ac3
This commit is contained in:
Jonathan Rosser 2021-03-10 12:16:38 +00:00
parent b4df743cfe
commit a0a07a43ac
5 changed files with 6 additions and 107 deletions

View File

@ -23,16 +23,6 @@
listen: listen:
- "venv changed" - "venv changed"
- name: Restart tftpd socket
service:
name: "{{ ironic_tftpd_service_name }}.socket"
state: restarted
enabled: yes
daemon_reload: yes
failed_when: false
when:
- "ansible_pkg_mgr in ['zypper']"
- name: Restart tftpd - name: Restart tftpd
service: service:
name: "{{ ironic_tftpd_service_name }}" name: "{{ ironic_tftpd_service_name }}"

View File

@ -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
- name: opensuse - focal
versions:
- 15
- name: EL - name: EL
versions: versions:
- 7 - 8
categories: categories:
- cloud - cloud
- baremetal - baremetal

View File

@ -52,16 +52,6 @@
remote_src: True remote_src: True
with_items: "{{ ironic_library_modules_paths }}" with_items: "{{ ironic_library_modules_paths }}"
# Add 'yum' in condition if tftp socket required to be started for centos.
- name: Start up tftp socket
when:
- "ansible_pkg_mgr in ['zypper']"
systemd:
daemon_reload: yes
name: "{{ ironic_tftpd_service_name }}.socket"
state: started
enabled: true
- name: Start up tftp - name: Start up tftp
service: service:
name: "{{ ironic_tftpd_service_name }}" name: "{{ ironic_tftpd_service_name }}"

View File

@ -22,14 +22,14 @@ ironic_devel_distro_packages:
ironic_api_distro_packages: ironic_api_distro_packages:
- libxml2-devel - libxml2-devel
- "{{ ansible_distribution_major_version is version('8', '<') | ternary('systemd-python', 'python3-systemd') }}" - python3-systemd
ironic_conductor_distro_packages: ironic_conductor_distro_packages:
- libxml2-devel - libxml2-devel
- "{{ ansible_distribution_major_version is version('8', '<') | ternary('syslinux-devel', 'syslinux') }}" - syslinux
- syslinux-tftpboot - syslinux-tftpboot
- libxslt-devel - libxslt-devel
- "qemu-kvm{% if ansible_distribution_major_version is version('8', '<') %}-ev{% endif %}" - qemu-kvm
- libiscsi-utils - libiscsi-utils
- iscsi-initiator-utils - iscsi-initiator-utils
- ipmitool - ipmitool

View File

@ -1,78 +0,0 @@
---
# Copyright 2019, SUSE
#
# 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.
cache_timeout: 600
ironic_devel_distro_packages:
- git-core
- libffi-devel
- systemd-devel
ironic_api_distro_packages:
- libxml2-devel
- python-systemd
ironic_conductor_distro_packages:
- ipmitool
- ipxe-bootimgs
- libxml2-devel
- libxslt-devel
- open-iscsi
- postgresql-devel
- python-yaml
- qemu-tools
- syslinux
- tftp
- gptfdisk
- nginx
ironic_conductor_standalone_distro_packages:
- dhcp-server
ironic_library_modules_paths:
- "/usr/share/syslinux/pxelinux.0"
- "/usr/share/syslinux/chain.c32"
- "/usr/share/syslinux/linux.c32"
ironic_tftpd_service_name: tftp
ironic_tftpd_root: /srv/tftpboot
ironic_inspector_http_distro_packages:
- nginx
ironic_inspector_isc_dhcp_distro_packages:
- tftpd-hpa
- isc-dhcp-server
ironic_inspector_dnsmasq_distro_packages:
- dnsmasq
ironic_inspector_standalone_distro_packages:
- isc-dhcp-server
ironic_inspector_devel_distro_packages:
- git-core
- libffi-dev
- libsystemd-dev
ironic_inspector_library_modules_paths:
- "/usr/lib/PXELINUX/pxelinux.0"
- "/usr/lib/PXELINUX/lpxelinux.0"
- "/usr/lib/syslinux/modules/efi64/chain.c32"
- "/usr/lib/syslinux/modules/bios/ldlinux.c32"
- "/usr/lib/SYSLINUX.EFI/efi64/syslinux.efi"
- "/usr/lib/syslinux/modules/efi64/ldlinux.e64"
ironic_nginx_conf_path: "conf.d"