From: whitestar <whitestar@users.osdn.me>
Date: Sat, 18 Aug 2018 02:58:26 +0000 (+0900)
Subject: modifies version normalizatoin for centos.
X-Git-Tag: docker-grid-1.0.0~2
X-Git-Url: http://git.osdn.net/view?p=metasearch%2Fgrid-chef-repo.git;a=commitdiff_plain;h=500627c9062563c2e655caf674290768e6e2a55f

modifies version normalizatoin for centos.
---

diff --git a/cookbooks/docker-grid/attributes/default.rb b/cookbooks/docker-grid/attributes/default.rb
index 76ee24b..50afc54 100644
--- a/cookbooks/docker-grid/attributes/default.rb
+++ b/cookbooks/docker-grid/attributes/default.rb
@@ -101,7 +101,11 @@ case platform
 when 'centos', 'redhat'
   version_on_centos = node['docker-grid']['engine']['version_on_centos']
   if !version_on_centos.nil? && !version_on_centos.empty? && version_on_centos != 'latest'
-    version_on_centos = "#{version_on_centos}.el#{node['platform_version'].to_i}.#{node['platform']}"
+    suffix = ''
+    if Gem::Version.create(version_on_centos) < Gem::Version.create('18.06.0')
+      suffix = ".#{node['platform']}"
+    end
+    version_on_centos = "#{version_on_centos}.el#{node['platform_version'].to_i}#{suffix}"
   end
 when 'debian'
   version_on_debian = node['docker-grid']['engine']['version_on_debian']