diff --git a/tasks/base/RedHat-8/install_dependencies.yml b/tasks/base/RedHat-8/install_dependencies.yml index c9a6c91..fcf1b21 100755 --- a/tasks/base/RedHat-8/install_dependencies.yml +++ b/tasks/base/RedHat-8/install_dependencies.yml @@ -6,3 +6,4 @@ with_items: - lvm2 - iptables + - policycoreutils-python-utils diff --git a/tasks/base/RedHat-8/install_docker.yml b/tasks/base/RedHat-8/install_docker.yml deleted file mode 100755 index 95768eb..0000000 --- a/tasks/base/RedHat-8/install_docker.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -- name: Remove docker - package: - name: "{{ packages }}" - state: absent - vars: - packages: - - docker - register: remove_packages - retries: 10 - delay: 30 - until: remove_packages is success - -- name: disable SELinux - selinux: - state: disabled - -- name: Add Docker GPG Key - rpm_key: - key: "{{ docker_version_map[docker_version]['keys']['server'] }}" - state: present - -- name: Add RHEL8 Extras repository - shell: dnf config-manager --add-repo="{{ docker_version_map[docker_version]['repo'] }}" - register: repo_installed - retries: 10 - delay: 30 - until: repo_installed is success - -- name: Install docker - package: - name: "{{ docker_version_map[docker_version]['package'] }}" - state: present - -- 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 diff --git a/tasks/base/RedHat-8/install_podman.yml b/tasks/base/RedHat-8/install_podman.yml new file mode 100644 index 0000000..8f4fb2f --- /dev/null +++ b/tasks/base/RedHat-8/install_podman.yml @@ -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 diff --git a/tasks/base/RedHat-8/main.yml b/tasks/base/RedHat-8/main.yml index 9bbd4a5..e4dc450 100755 --- a/tasks/base/RedHat-8/main.yml +++ b/tasks/base/RedHat-8/main.yml @@ -7,5 +7,6 @@ ignore_errors: true - include_tasks: install_dependencies.yml -- include_tasks: install_docker.yml - tags: [install_docker, destructive] \ No newline at end of file +- ansible.builtin.include_tasks: install_podman.yml + tags: [install_docker, destructive] + when: container_engine == "Podman" \ No newline at end of file diff --git a/tasks/base/general/configure_podman.yml b/tasks/base/general/configure_podman.yml index f065917..0c295dd 100755 --- a/tasks/base/general/configure_podman.yml +++ b/tasks/base/general/configure_podman.yml @@ -63,4 +63,5 @@ daemon_reload: yes loop: - podman.service - - podman.socket \ No newline at end of file + - podman.socket + - podman-restart.service diff --git a/tasks/ece-bootstrap/primary/install_stack.yml b/tasks/ece-bootstrap/primary/install_stack.yml index a6434fd..8ad65cd 100755 --- a/tasks/ece-bootstrap/primary/install_stack.yml +++ b/tasks/ece-bootstrap/primary/install_stack.yml @@ -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 diff --git a/vars/os_RedHat_8.yml b/vars/os_RedHat_8.yml index 1f5907e..59d834a 100644 --- a/vars/os_RedHat_8.yml +++ b/vars/os_RedHat_8.yml @@ -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