common: add centos8 support

This commit adds CentOS 8 support. Signed-off-by: Guillaume Abrioux <[email protected]>
ceph · Dec 19, 2019 · 3667af0 · 3667af0
1 parent f6463e5
commit 3667af0
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 6 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,22 @@
 ---
+- name: install dnf-plugins-core
+  package:
+    name: dnf-plugins-core
+  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
+
+- 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-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/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-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