Merge pull request #37 from DataDog/paulcacheux/fix-centos-kernel-devel

CentOS: install kernel-devel instead of kernel-headers
DataDog · Feb 17, 2022 · 6157c35 · 6157c35
2 parents 054046d + dd66c50
commit 6157c35
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 15 deletions.
diff --git a/rpm/centos.go b/rpm/centos.go
@@ -36,7 +36,7 @@ func getRedhatRelease() (string, error) {
 }
 
 func (b *CentOSBackend) GetKernelHeaders(directory string) error {
-	pkgNevra := "kernel-headers-" + b.target.Uname.Kernel
+	pkgNevra := "kernel-devel-" + b.target.Uname.Kernel
 
 	// First try with the 'base' and 'updates' repositories.
 	// This should work if the user is using the latest minor version

diff --git a/tests/molecule/resources/playbooks/verify-headers-centos.yml b/tests/molecule/resources/playbooks/verify-headers-centos.yml
diff --git a/...urces/playbooks/verify-headers-fedora.yml → ...laybooks/verify-headers-fedora-centos.yml b/...urces/playbooks/verify-headers-fedora.yml → ...laybooks/verify-headers-fedora-centos.yml
diff --git a/tests/molecule/resources/playbooks/verify.yml b/tests/molecule/resources/playbooks/verify.yml
@@ -34,8 +34,5 @@
   - include_tasks: verify-headers.yml
     when: not (ansible_distribution is defined and (ansible_distribution == 'CentOS' or ansible_distribution == 'Fedora'))
 
-  - include_tasks: verify-headers-centos.yml
-    when: ansible_distribution is defined and ansible_distribution == 'CentOS'
-
-  - include_tasks: verify-headers-fedora.yml
-    when: ansible_distribution is defined and ansible_distribution == 'Fedora'
+  - include_tasks: verify-headers-fedora-centos.yml
+    when: ansible_distribution is defined and (ansible_distribution == 'CentOS' or ansible_distribution == 'Fedora')