mirror of https://github.com/ceph/ceph-ansible.git
tests: use centos stream-8 instead of centos 8
CentOS 8 is EOL as of December 2021.
Let's use CentOS stream 8 instead.
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit bc36f60e8d
)
pull/7071/head
parent
f7389ecf25
commit
9916c2d752
|
@ -23,7 +23,7 @@ cluster_subnet: 192.168.31
|
||||||
# set 1024 for CentOS
|
# set 1024 for CentOS
|
||||||
memory: 2048
|
memory: 2048
|
||||||
|
|
||||||
vagrant_box: centos/8
|
vagrant_box: centos/stream8
|
||||||
# The sync directory changes based on vagrant box
|
# The sync directory changes based on vagrant box
|
||||||
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
|
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
|
||||||
#vagrant_sync_dir: /home/vagrant/sync
|
#vagrant_sync_dir: /home/vagrant/sync
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
vagrant box remove --force --provider libvirt --box-version 0 centos/8 || true
|
vagrant box remove --force --provider libvirt --box-version 0 centos/stream8 || true
|
||||||
vagrant box add --provider libvirt --name centos/8 https://cloud.centos.org/centos/8/vagrant/x86_64/images/CentOS-8-Vagrant-8.4.2105-20210603.0.x86_64.vagrant-libvirt.box || true
|
vagrant box add --provider libvirt --name centos/stream8 https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-Vagrant-8-20220125.1.x86_64.vagrant-libvirt.box || true
|
||||||
|
|
||||||
retries=0
|
retries=0
|
||||||
until [ $retries -ge 5 ]
|
until [ $retries -ge 5 ]
|
||||||
|
|
|
@ -21,7 +21,7 @@ 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/stream8
|
||||||
|
|
||||||
deps= -r{toxinidir}/tests/requirements.txt
|
deps= -r{toxinidir}/tests/requirements.txt
|
||||||
changedir= {toxinidir}/tests/functional/cephadm
|
changedir= {toxinidir}/tests/functional/cephadm
|
||||||
|
|
|
@ -20,8 +20,8 @@ setenv=
|
||||||
ANSIBLE_STDOUT_CALLBACK = yaml
|
ANSIBLE_STDOUT_CALLBACK = yaml
|
||||||
# non_container: DEV_SETUP = True
|
# non_container: DEV_SETUP = True
|
||||||
# Set the vagrant box image to use
|
# Set the vagrant box image to use
|
||||||
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
|
|
||||||
container: CONTAINER_DIR = /container
|
container: CONTAINER_DIR = /container
|
||||||
container: PLAYBOOK = site-container.yml.sample
|
container: PLAYBOOK = site-container.yml.sample
|
||||||
|
|
|
@ -20,8 +20,8 @@ setenv=
|
||||||
ANSIBLE_STDOUT_CALLBACK = yaml
|
ANSIBLE_STDOUT_CALLBACK = yaml
|
||||||
# non_container: DEV_SETUP = True
|
# non_container: DEV_SETUP = True
|
||||||
# Set the vagrant box image to use
|
# Set the vagrant box image to use
|
||||||
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
|
|
||||||
# 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}
|
||||||
|
|
|
@ -21,7 +21,7 @@ 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/stream8
|
||||||
|
|
||||||
# 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}
|
||||||
|
|
|
@ -61,8 +61,8 @@ setenv=
|
||||||
ANSIBLE_STDOUT_CALLBACK = yaml
|
ANSIBLE_STDOUT_CALLBACK = yaml
|
||||||
non_container: DEV_SETUP = True
|
non_container: DEV_SETUP = True
|
||||||
# Set the vagrant box image to use
|
# Set the vagrant box image to use
|
||||||
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
INVENTORY = {env:_INVENTORY:hosts}
|
INVENTORY = {env:_INVENTORY:hosts}
|
||||||
container: CONTAINER_DIR = /container
|
container: CONTAINER_DIR = /container
|
||||||
container: PLAYBOOK = site-container.yml.sample
|
container: PLAYBOOK = site-container.yml.sample
|
||||||
|
|
|
@ -20,8 +20,8 @@ setenv=
|
||||||
ANSIBLE_STDOUT_CALLBACK = yaml
|
ANSIBLE_STDOUT_CALLBACK = yaml
|
||||||
# non_container: DEV_SETUP = True
|
# non_container: DEV_SETUP = True
|
||||||
# Set the vagrant box image to use
|
# Set the vagrant box image to use
|
||||||
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
|
|
||||||
INVENTORY = {env:_INVENTORY:hosts}
|
INVENTORY = {env:_INVENTORY:hosts}
|
||||||
container: CONTAINER_DIR = /container
|
container: CONTAINER_DIR = /container
|
||||||
|
|
|
@ -20,8 +20,8 @@ setenv=
|
||||||
ANSIBLE_STDOUT_CALLBACK = yaml
|
ANSIBLE_STDOUT_CALLBACK = yaml
|
||||||
# non_container: DEV_SETUP = True
|
# non_container: DEV_SETUP = True
|
||||||
# Set the vagrant box image to use
|
# Set the vagrant box image to use
|
||||||
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
|
|
||||||
INVENTORY = {env:_INVENTORY:hosts}
|
INVENTORY = {env:_INVENTORY:hosts}
|
||||||
container: CONTAINER_DIR = /container
|
container: CONTAINER_DIR = /container
|
||||||
|
|
4
tox.ini
4
tox.ini
|
@ -277,8 +277,8 @@ setenv=
|
||||||
ANSIBLE_STDOUT_CALLBACK = yaml
|
ANSIBLE_STDOUT_CALLBACK = yaml
|
||||||
non_container: DEV_SETUP = True
|
non_container: DEV_SETUP = True
|
||||||
# Set the vagrant box image to use
|
# Set the vagrant box image to use
|
||||||
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
|
centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/stream8
|
||||||
INVENTORY = {env:_INVENTORY:hosts}
|
INVENTORY = {env:_INVENTORY:hosts}
|
||||||
container: CONTAINER_DIR = /container
|
container: CONTAINER_DIR = /container
|
||||||
container: PLAYBOOK = site-container.yml.sample
|
container: PLAYBOOK = site-container.yml.sample
|
||||||
|
|
Loading…
Reference in New Issue