diff --git a/roles/ceph-container-engine/tasks/main.yml b/roles/ceph-container-engine/tasks/main.yml index d328c124f6..c6af42601d 100644 --- a/roles/ceph-container-engine/tasks/main.yml +++ b/roles/ceph-container-engine/tasks/main.yml @@ -1,4 +1,4 @@ --- - name: include pre_requisites/prerequisites.yml include_tasks: pre_requisites/prerequisites.yml - when: not is_atomic | bool + when: not is_atomic diff --git a/roles/ceph-container-engine/vars/CentOS-8.yml b/roles/ceph-container-engine/vars/CentOS-8.yml deleted file mode 120000 index d49e1cd593..0000000000 --- a/roles/ceph-container-engine/vars/CentOS-8.yml +++ /dev/null @@ -1 +0,0 @@ -RedHat-8.yml \ No newline at end of file diff --git a/tox-podman.ini b/tox-podman.ini index 76a59191ca..2326a7749f 100644 --- a/tox-podman.ini +++ b/tox-podman.ini @@ -22,11 +22,12 @@ setenv= # only available for ansible >= 2.5 ANSIBLE_STDOUT_CALLBACK = yaml # Set the vagrant box image to use - CEPH_ANSIBLE_VAGRANT_BOX = centos/8 + CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host # Set the ansible inventory host file to be used according to which distrib we are running on INVENTORY = {env:_INVENTORY:hosts} - PLAYBOOK = site-container.yml.sample + PLAYBOOK = site-docker.yml.sample + PURGE_PLAYBOOK = purge-docker-cluster.yml IS_PODMAN = TRUE CEPH_STABLE_RELEASE = nautilus @@ -48,6 +49,10 @@ commands= ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ + container_binary=podman \ + container_package_name=podman \ + container_service_name=podman \ + container_binding_name=podman \ " # wait 30sec for services to be ready