Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial support for RHEL8 #198

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tasks/base/RedHat-8/install_dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@
with_items:
- lvm2
- iptables
- policycoreutils-python-utils
40 changes: 0 additions & 40 deletions tasks/base/RedHat-8/install_docker.yml

This file was deleted.

18 changes: 18 additions & 0 deletions tasks/base/RedHat-8/install_podman.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
- name: disable SELinux
selinux:
state: disabled

- name: Install Podman
package:
name: "{{ podman_version_map[podman_version]['package'] }}"
state: present
loop:
- "{{ podman_version_map[podman_version]['package'] }}"

- name: Verify that fs.may_detach_mounts is enabled
lineinfile:
path: /etc/sysctl.conf
regexp: '^fs.may_detach_mounts'
line: 'fs.may_detach_mounts = 1'
create: yes
5 changes: 3 additions & 2 deletions tasks/base/RedHat-8/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@
ignore_errors: true

- include_tasks: install_dependencies.yml
- include_tasks: install_docker.yml
tags: [install_docker, destructive]
- ansible.builtin.include_tasks: install_podman.yml
tags: [install_docker, destructive]
when: container_engine == "Podman"
3 changes: 2 additions & 1 deletion tasks/base/general/configure_podman.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,5 @@
daemon_reload: yes
loop:
- podman.service
- podman.socket
- podman.socket
- podman-restart.service
2 changes: 1 addition & 1 deletion tasks/ece-bootstrap/primary/install_stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

- name: Monitor installer progress
ansible.builtin.shell:
cmd: tail -n 5 /mnt/data/elastic/logs/bootstrap-logs/bootstrap.log
cmd: "tail -n 5 {{ data_dir }}/elastic/logs/bootstrap-logs/bootstrap.log"
until: "'[no.found.util.LogApplicationExit$] Application is exiting {}' in ece_installer_result_text.stdout"
register: ece_installer_result_text
retries: 192
Expand Down
31 changes: 7 additions & 24 deletions vars/os_RedHat_8.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,12 @@
---
docker_unit_after: "multi-user.target"
docker_storage_driver: overlay2
bootloader_update_command: grub2-mkconfig -o /etc/grub2.cfg
conntrack_module: ip_conntrack
container_engine: Docker
container_engine: Podman

# Docker version mapping
docker_version_map:
"19.03":
name: 'Docker-CE'
# Podman version mapping
podman_version_map:
"4.9.4":
name: "podman"
package:
- docker-ce-19.03.13
- docker-ce-cli-19.03.13
- containerd.io-1.5.11
repo: https://download.docker.com/linux/centos/docker-ce.repo
keys:
server: https://download.docker.com/linux/centos/gpg
id: 060A 61C5 1B55 8A7F 742B 77AA C52F EB6B 621E 9F35
"20.10":
name: 'Docker-CE'
package:
- docker-ce-20.10.8
- docker-ce-cli-20.10.8
- containerd.io-1.5.11
repo: https://download.docker.com/linux/centos/docker-ce.repo
keys:
server: https://download.docker.com/linux/centos/gpg
id: 060A 61C5 1B55 8A7F 742B 77AA C52F EB6B 621E 9F35
- podman-4.9.4
- podman-remote-4.9.4