From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 27 Nov 2019 14:21:15 +0000 (+0100)
Subject: Revert "tox-podman: use centos 8 vagrant image"
X-Git-Tag: v6.0.0alpha1~203
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f19a2aef1a5421be590954b79de3beedcda58aa2;p=ceph-ansible.git

Revert "tox-podman: use centos 8 vagrant image"

This reverts commit 19e9a06ab1429769a0513c54c12bf07698d2178f.
---

diff --git a/roles/ceph-container-engine/tasks/main.yml b/roles/ceph-container-engine/tasks/main.yml
index d328c124f..c6af42601 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 d49e1cd59..000000000
--- 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 76a59191c..2326a7749 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