diff --git a/ansible/group_vars/platform_rhcos.yml b/ansible/group_vars/platform_rhcos.yml index c69c65f83f..792d9227f7 100644 --- a/ansible/group_vars/platform_rhcos.yml +++ b/ansible/group_vars/platform_rhcos.yml @@ -1,8 +1,2 @@ --- ansible_user: core - -runtime_command: podman -runtime_as_root: true -runtime_socket: /run/podman/podman.sock - -needs_selinux_permissive: true diff --git a/ansible/roles/create-vm/tasks/create-ppc64le-vm.yml b/ansible/roles/create-vm/tasks/create-ppc64le-vm.yml index 6784b30fcc..282faecc34 100644 --- a/ansible/roles/create-vm/tasks/create-ppc64le-vm.yml +++ b/ansible/roles/create-vm/tasks/create-ppc64le-vm.yml @@ -143,7 +143,7 @@ - job_id_{{ job_id }} - platform_{{ test_platform }} - vm_arch_ppc64le - - container_engine_podman + - container_engine_docker ansible_ssh_extra_args: -o StrictHostKeyChecking=no ansible_ssh_private_key_file: "{{ vm_ssh_key_file }}" vm_config: "{{ vm_config }}" diff --git a/ansible/roles/create-vm/tasks/create-s390x-vm.yml b/ansible/roles/create-vm/tasks/create-s390x-vm.yml index dd98631dec..f735a1940f 100644 --- a/ansible/roles/create-vm/tasks/create-s390x-vm.yml +++ b/ansible/roles/create-vm/tasks/create-s390x-vm.yml @@ -58,7 +58,7 @@ - job_id_{{ job_id }} - platform_{{ test_platform }} - vm_arch_s390x - - container_engine_podman + - container_engine_docker ansible_ssh_extra_args: "-o StrictHostKeyChecking=no" ansible_ssh_private_key_file: "{{ vm_ssh_key_file }}" vm_config: "{{ vm_config }}" diff --git a/ansible/roles/provision-vm/tasks/redhat.yml b/ansible/roles/provision-vm/tasks/redhat.yml index 4a8925b783..69cc403e79 100644 --- a/ansible/roles/provision-vm/tasks/redhat.yml +++ b/ansible/roles/provision-vm/tasks/redhat.yml @@ -25,6 +25,28 @@ until: registration is not failed when: vm_arch == "ppc64le" or vm_arch == "s390x" +- name: Install needed utilities + ansible.builtin.dnf: + name: + - git + - make + +- name: Add docker repos + ansible.builtin.shell: | + dnf config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo + when: runtime_command == 'docker' + +- name: Install docker + ansible.builtin.dnf: + name: + - docker-ce + - docker-ce-cli + - containerd.io + - docker-buildx-plugin + - docker-compose-plugin + state: present + when: runtime_command == 'docker' + - name: Install podman ansible.builtin.dnf: name: @@ -34,4 +56,5 @@ - make state: latest update_cache: true + when: runtime_command == 'podman'