Fixes http://tracker.ceph.com/issues/14790

Cobbler would fail to create kickstart because non-Fedora distros would return 7.X, for example, as the integer resulting in CentOS and RHEL kickstarts to fail

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

diff --git a/roles/cobbler/templates/snippets/cephlab_packages_rhel b/roles/cobbler/templates/snippets/cephlab_packages_rhel
index f6ce35e505ae075b62e774dbd26c37dd2ada1f15..ac772bd9b7895911b181b8d6e8be72b08bff8494 100644 (file)
--- a/roles/cobbler/templates/snippets/cephlab_packages_rhel
+++ b/roles/cobbler/templates/snippets/cephlab_packages_rhel
@@ -1,8 +1,8 @@
 ## {{ 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
+#set distro_ver = $getVar('distro','').split("-")[1]
+#if $distro == 'Fedora' and int($distro_ver) >= 22
 @^infrastructure-server-environment
 #else
 @base

diff --git a/roles/cobbler/templates/snippets/cephlab_rc_local b/roles/cobbler/templates/snippets/cephlab_rc_local
index 263a5fda5b404ddfef6e89dd89f1a2580aa61b06..17bee594e7afa2f1ab909bb4d28e6f435c86dfb5 100644 (file)
--- a/roles/cobbler/templates/snippets/cephlab_rc_local
+++ b/roles/cobbler/templates/snippets/cephlab_rc_local
@@ -2,8 +2,8 @@
 #set lockfile = '/.cephlab_rc_local'
 # Set proper location for firstboot ansible post-install trigger
 #set distro = $getVar('distro','').split("-")[0]
-#set distro_ver = $int($getVar('distro','').split("-")[1])
-#if $distro == 'Fedora' and $distro_ver >= 22
+#set distro_ver = $getVar('distro','').split("-")[1]
+#if $distro == 'Fedora' and int($distro_ver) >= 22
 #set script = '/etc/rc.d/rc.local'
 #else
 #set script = '/etc/rc.local'