cobbler: Modify Fedora 22 packages installed during kickstart

The @base group no longer exists in Fedora 22 and causes anaconda to
halt during install.  Using @^infrastructure-server-environment in its place

The gpg_keys ansible task requires yum to be installed prior to first boot

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
index 0bc417fd8ecd50c373229f1742d59f5fd587efe8..b3282074515646a28e680e402b53d0f7fa91eb56 100644 (file)
--- a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
+++ b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks
@@ -46,7 +46,6 @@ $SNIPPET('pre_anamon')
 
 %packages
 @core
-@base
 $SNIPPET('cephlab_packages_rhel')
 $SNIPPET('func_install_if_enabled')
 %end

diff --git a/roles/cobbler/templates/snippets/cephlab_packages_rhel b/roles/cobbler/templates/snippets/cephlab_packages_rhel
index 816be9e1e3f0a319a61a9680d5ca0250984d601d..47a3749d126ea22e331092f62cbd539ab0c22b47 100644 (file)
--- a/roles/cobbler/templates/snippets/cephlab_packages_rhel
+++ b/roles/cobbler/templates/snippets/cephlab_packages_rhel
@@ -1,7 +1,17 @@
 ## {{ ansible_managed }}
+## @base group no longer exists in >=Fedora-22
+#set distro = $getVar('distro','').split("-")[0]
+#set distro_ver = $int($getVar('distro','').split("-")[1])
+#if $distro == 'Fedora' and $distro_ver >= 22
+@^infrastructure-server-environment
+## yum is required for GPG installation until we move to ansible v2.0 package module
+yum
+#else
+@base
+#end if
+## Ansible seems to need the SELinux python bindings on RHEL6
 #set os_version = $getVar('os_version','')
 #if $os_version == 'rhel6'
-# Ansible seems to need the SELinux python bindings on RHEL6
 libselinux-python
 #end if
 perl