From 466369e380ede4e202b6bf38ecc9d2c7434a7b5b Mon Sep 17 00:00:00 2001 From: David Galloway Date: Tue, 16 Feb 2016 14:50:27 -0500 Subject: [PATCH] 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 --- roles/cobbler/templates/kickstarts/cephlab_rhel.ks | 1 - .../cobbler/templates/snippets/cephlab_packages_rhel | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/roles/cobbler/templates/kickstarts/cephlab_rhel.ks b/roles/cobbler/templates/kickstarts/cephlab_rhel.ks index 0bc417f..b328207 100644 --- 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 816be9e..47a3749 100644 --- 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 -- 2.39.5