From 19e9a06ab1429769a0513c54c12bf07698d2178f Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Mon, 18 Nov 2019 15:05:16 -0500 Subject: [PATCH] tox-podman: use centos 8 vagrant image Switch the podman scenario from atomic centos 7 to centos 8 (not atomic) Signed-off-by: Dimitri Savineau --- roles/ceph-container-engine/tasks/main.yml | 2 +- roles/ceph-container-engine/vars/CentOS-8.yml | 1 + tox-podman.ini | 9 ++------- 3 files changed, 4 insertions(+), 8 deletions(-) create mode 120000 roles/ceph-container-engine/vars/CentOS-8.yml diff --git a/roles/ceph-container-engine/tasks/main.yml b/roles/ceph-container-engine/tasks/main.yml index c6af42601d..d328c124f6 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 + when: not is_atomic | bool diff --git a/roles/ceph-container-engine/vars/CentOS-8.yml b/roles/ceph-container-engine/vars/CentOS-8.yml new file mode 120000 index 0000000000..d49e1cd593 --- /dev/null +++ b/roles/ceph-container-engine/vars/CentOS-8.yml @@ -0,0 +1 @@ +RedHat-8.yml \ No newline at end of file diff --git a/tox-podman.ini b/tox-podman.ini index 2326a7749f..76a59191ca 100644 --- a/tox-podman.ini +++ b/tox-podman.ini @@ -22,12 +22,11 @@ setenv= # only available for ansible >= 2.5 ANSIBLE_STDOUT_CALLBACK = yaml # Set the vagrant box image to use - CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host + CEPH_ANSIBLE_VAGRANT_BOX = centos/8 # Set the ansible inventory host file to be used according to which distrib we are running on INVENTORY = {env:_INVENTORY:hosts} - PLAYBOOK = site-docker.yml.sample - PURGE_PLAYBOOK = purge-docker-cluster.yml + PLAYBOOK = site-container.yml.sample IS_PODMAN = TRUE CEPH_STABLE_RELEASE = nautilus @@ -49,10 +48,6 @@ 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