diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 06ca800df9..0f44c4942b 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -85,7 +85,7 @@ dummy: #centos_package_dependencies: # - epel-release -# - libselinux-python +# - python3-libselinux #redhat_package_dependencies: [] diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 33fd858a8f..7bd9c67c46 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -85,7 +85,7 @@ fetch_directory: ~/ceph-ansible-keys #centos_package_dependencies: # - epel-release -# - libselinux-python +# - python3-libselinux #redhat_package_dependencies: [] diff --git a/roles/ceph-common/tasks/installs/redhat_community_repository.yml b/roles/ceph-common/tasks/installs/redhat_community_repository.yml index 332491d4a5..aee8fffe93 100644 --- a/roles/ceph-common/tasks/installs/redhat_community_repository.yml +++ b/roles/ceph-common/tasks/installs/redhat_community_repository.yml @@ -5,6 +5,7 @@ register: result until: result is succeeded tags: with_pkg + when: ansible_distribution_major_version | int == 7 - name: configure red hat ceph community repository stable key rpm_key: diff --git a/roles/ceph-common/tasks/installs/redhat_dev_repository.yml b/roles/ceph-common/tasks/installs/redhat_dev_repository.yml index 2b767e9291..85a32a1ab9 100644 --- a/roles/ceph-common/tasks/installs/redhat_dev_repository.yml +++ b/roles/ceph-common/tasks/installs/redhat_dev_repository.yml @@ -1,4 +1,27 @@ --- +- name: install dnf-plugins-core + package: + name: dnf-plugins-core + register: result + until: result is succeeded + tags: with_pkg + +- name: enable ceph-el8 copr + command: dnf copr enable -y ktdreyer/ceph-el8 + args: + creates: /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:ktdreyer:ceph-el8.repo + warn: false + register: result + until: result is succeeded + +- name: enable ceph lab extras repository + yum_repository: + name: lab-extras + baseurl: http://apt-mirror.front.sepia.ceph.com/lab-extras/8/ + description: Sepia Lab Extras repository + enabled: true + gpgcheck: false + - name: fetch ceph red hat development repository uri: # Use the centos repo since we don't currently have a dedicated red hat repo 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/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 1515bfac40..df2ac751b1 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -77,7 +77,7 @@ debian_package_dependencies: [] centos_package_dependencies: - epel-release - - libselinux-python + - python3-libselinux redhat_package_dependencies: [] diff --git a/tests/conftest.py b/tests/conftest.py index 032e704a0f..0d8a01e2b6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -64,8 +64,6 @@ def setup(host): address = host.interface(public_interface).addresses[0] if docker: - container_binary = "docker" - if docker and str_to_bool(os.environ.get('IS_PODMAN', False)): # noqa E501 container_binary = "podman" data = dict( diff --git a/tests/functional/setup.yml b/tests/functional/setup.yml index 3fb6444542..f709940f8e 100644 --- a/tests/functional/setup.yml +++ b/tests/functional/setup.yml @@ -66,6 +66,7 @@ state: absent when: - ansible_distribution == 'CentOS' + - ansible_distribution_major_version | int == 7 - not is_atomic | bool - name: resize logical volume for root partition to fill remaining free space diff --git a/tox-filestore_to_bluestore.ini b/tox-filestore_to_bluestore.ini index 01b5ef2caf..8dd6828401 100644 --- a/tox-filestore_to_bluestore.ini +++ b/tox-filestore_to_bluestore.ini @@ -20,8 +20,8 @@ setenv= ANSIBLE_STDOUT_CALLBACK = yaml # non_container: DEV_SETUP = True # Set the vagrant box image to use - centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 - centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host + centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8 + centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8 ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64 # Set the ansible inventory host file to be used according to which distrib we are running on diff --git a/tox-podman.ini b/tox-podman.ini index 84cbc96cc9..c3a7811826 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 - IS_PODMAN = TRUE + PLAYBOOK = site-container.yml.sample CEPH_STABLE_RELEASE = nautilus deps= -r{toxinidir}/tests/requirements.txt @@ -48,10 +47,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 diff --git a/tox-update.ini b/tox-update.ini index 3147c344dd..6103314460 100644 --- a/tox-update.ini +++ b/tox-update.ini @@ -20,8 +20,8 @@ setenv= ANSIBLE_STDOUT_CALLBACK = yaml # non_container: DEV_SETUP = True # Set the vagrant box image to use - centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 - centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host + centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8 + centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8 ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64 # Set the ansible inventory host file to be used according to which distrib we are running on diff --git a/tox.ini b/tox.ini index ce7de02b92..39ad3480c0 100644 --- a/tox.ini +++ b/tox.ini @@ -385,8 +385,8 @@ setenv= ANSIBLE_STDOUT_CALLBACK = yaml non_container: DEV_SETUP = True # Set the vagrant box image to use - centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 - centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host + centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8 + centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8 ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64 # Set the ansible inventory host file to be used according to which distrib we are running on