ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This reverts commit 19e9a06ab1.
pull/4788/head
Guillaume Abrioux 2019-11-27 15:21:15 +01:00
parent cf8c6a3849
commit f19a2aef1a
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-container-engine/tasks/main.yml
View File

@ -1,4 +1,4 @@
--- ---
- name: include pre_requisites/prerequisites.yml - name: include pre_requisites/prerequisites.yml
include_tasks: pre_requisites/prerequisites.yml include_tasks: pre_requisites/prerequisites.yml
when: not is_atomic | bool when: not is_atomic

1
roles/ceph-container-engine/vars/CentOS-8.yml
View File

@ -1 +0,0 @@
RedHat-8.yml

9
tox-podman.ini
View File

@ -22,11 +22,12 @@ setenv=
# only available for ansible >= 2.5 # only available for ansible >= 2.5
ANSIBLE_STDOUT_CALLBACK = yaml ANSIBLE_STDOUT_CALLBACK = yaml
# Set the vagrant box image to use # 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 # Set the ansible inventory host file to be used according to which distrib we are running on
INVENTORY = {env:_INVENTORY:hosts} INVENTORY = {env:_INVENTORY:hosts}
PLAYBOOK = site-container.yml.sample PLAYBOOK = site-docker.yml.sample
PURGE_PLAYBOOK = purge-docker-cluster.yml
IS_PODMAN = TRUE IS_PODMAN = TRUE
CEPH_STABLE_RELEASE = nautilus CEPH_STABLE_RELEASE = nautilus
@ -48,6 +49,10 @@ commands=
ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \
ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \
ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ 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 # wait 30sec for services to be ready