common: add centos8 support

Ceph octopus only supports CentOS 8. This commit adds CentOS 8 support: - update vagrant image in tox configurations. - add CentOS 8 repository for el8 dependencies. - CentOS 8 container engine is podman (same than RHEL 8). - don't use the epel mirror on sepia because it's epel7 only. Signed-off-by: Guillaume Abrioux <[email protected]> Co-authored-by: Dimitri Savineau <[email protected]>
ceph · Dec 20, 2019 · a33ae11 · a33ae11
1 parent 8056514
commit a33ae11
Show file tree

Hide file tree

Showing 13 changed files with 35 additions and 16 deletions.
diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
@@ -85,7 +85,7 @@ dummy:
 
 #centos_package_dependencies:
 #  - epel-release
-#  - libselinux-python
+#  - "{{ 'libselinux-python' if ansible_distribution_major_version | int != 8 else 'python3-libselinux' }}"
 
 #redhat_package_dependencies: []
 

diff --git 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
+#  - "{{ 'libselinux-python' if ansible_distribution_major_version | int != 8 else '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
@@ -5,6 +5,7 @@
   register: result
   until: result is succeeded
   tags: with_pkg
+  when: ansible_distribution_major_version | int == 8
 
 - 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
@@ -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
@@ -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
@@ -0,0 +1 @@
+RedHat-8.yml
diff --git 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
+  - "{{ 'libselinux-python' if ansible_distribution_major_version | int != 8 else 'python3-libselinux' }}"
 
 redhat_package_dependencies: []
 

diff --git 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
@@ -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
@@ -20,7 +20,7 @@ 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-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
   centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host
   ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64
 

diff --git 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
@@ -20,7 +20,7 @@ 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-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
   centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host
   ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64
 

diff --git a/tox.ini b/tox.ini
@@ -385,7 +385,7 @@ 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-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/8
   centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host
   ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = guits/ubuntu-bionic64