cobbler: Update kernel on RPM distros and subscribe to CDN on RHEL

during kickstart

Fixes: https://tracker.ceph.com/issues/23052
Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/cobbler/defaults/main.yml b/roles/cobbler/defaults/main.yml
index 0acf7c90abc69838d6ac296f406ba8f75ea12b55..214b82549a4003ba747cd410ba024df353365522 100644 (file)
--- a/roles/cobbler/defaults/main.yml
+++ b/roles/cobbler/defaults/main.yml
@@ -40,6 +40,7 @@ snippets:
   - cephlab_rc_local
   - cephlab_rhel_disks
   - cephlab_post_install_kernel_options
+  - cephlab_rhel_rhsm
 
 scripts:
   - cephlab_preseed_late

diff --git a/roles/cobbler/tasks/upload_templates.yml b/roles/cobbler/tasks/upload_templates.yml
index 99ca0395179949d561a5596a9d87286211d2bd77..647adad3c23e956986504b3b1716e47ab1510aaf 100644 (file)
--- a/roles/cobbler/tasks/upload_templates.yml
+++ b/roles/cobbler/tasks/upload_templates.yml
@@ -1,4 +1,15 @@
 ---
+# We need to include our RHSM entitlements from the secrets repo to subscribe
+# RHEL systems during post-install.
+- name: Include RHSM entitlement credentials
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ secrets_path }}/entitlements.yml"
+    - roles/common/vars/empty.yml
+  no_log: true
+  tags:
+    - always
+
 - name: Upload index.html template
   template:
     src: "httpd/index.html"

diff --git a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
index 482c5a9a1a35bb3e4a7a0c479d9c71947e9065ae..03f8b0ff7d6f07434f3286bbda45a7d01e063489 100644 (file)
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
@@ -70,6 +70,12 @@ $SNIPPET('post_anamon')
 # Start final steps
 $SNIPPET('cephlab_hostname')
 $SNIPPET('cephlab_user')
+#set distro = $getVar('distro','').split("-")[0]
+#if $distro == 'RHEL'
+$SNIPPET('cephlab_rhel_rhsm')
+#end if
+# Update to latest kernel before rebooting
+yum -y update kernel
 $SNIPPET('cephlab_rc_local')
 $SNIPPET('kickstart_done')
 # End final steps

diff --git a/roles/cobbler/templates/snippets/cephlab_rhel_rhsm b/roles/cobbler/templates/snippets/cephlab_rhel_rhsm
new file mode 100644 (file)
index 0000000..9c8c2a0
--- /dev/null
+++ b/roles/cobbler/templates/snippets/cephlab_rhel_rhsm
@@ -0,0 +1,9 @@
+## {{ ansible_managed }}
+## Subscribe (These vars will be empty and this snippet won't get run if the vars aren't set like in Sepia)
+subscription-manager register --activationkey={{ subscription_manager_activationkey }} --org={{ subscription_manager_org }}
+## Enable repos
+#if $os_version == 'rhel7'
+subscription-manager repos --enable rhel-7-server-rpms --enable=rhel-7-server-optional-rpms --enable=rhel-7-server-extras-rpms
+#else
+subscription-manager repos --enable rhel-6-server-rpms --enable=rhel-6-server-optional-rpms --enable=rhel-6-server-extras-rpms --enable=rhel-scalefs-for-rhel-6-server-rpms
+#end if