Merge pull request #319 from caskdata/feature/add-hdp-2.6

add hdp 2.6.0.3-8
cdapio · Apr 6, 2017 · 9883066 · 9883066
2 parents b6dbdd2 + c1a0fb9
commit 9883066
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -22,3 +22,5 @@ Metrics/PerceivedComplexity:
   Enabled: false
 Style/FrozenStringLiteralComment:
   Enabled: false
+Style/PercentLiteralDelimiters:
+  Enabled: false
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -135,6 +135,8 @@
     '2.5.0.0-1245'
   when '2.5.3.0'
     '2.5.3.0-37'
+  when '2.6.0.3'
+    '2.6.0.3-8'
   else
     node['hadoop']['distribution_version']
   end

diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -60,6 +60,8 @@ def hdp_version
         '2.5.0.0-1245'
       when '2.5.3.0'
         '2.5.3.0-37'
+      when '2.6.0.3'
+        '2.6.0.3-8'
       else
         node['hadoop']['distribution_version']
       end

diff --git a/recipes/repo.rb b/recipes/repo.rb
@@ -64,11 +64,16 @@
     hdp_update_version = '2.4.3.0'
     Chef::Log.warn("Short versions for node['hadoop']['distribution_version'] are deprecated! Please use full version!")
     node.override['hadoop']['distribution_version'] = hdp_update_version
-  when '2.5', '2'
+  when '2.5'
     hdp_version = '2.2.0.0'
     hdp_update_version = '2.5.3.0'
     Chef::Log.warn("Short versions for node['hadoop']['distribution_version'] are deprecated! Please use full version!")
     node.override['hadoop']['distribution_version'] = hdp_update_version
+  when '2.6', '2'
+    hdp_version = '2.2.0.0'
+    hdp_update_version = '2.6.0.3'
+    Chef::Log.warn("Short versions for node['hadoop']['distribution_version'] are deprecated! Please use full version!")
+    node.override['hadoop']['distribution_version'] = hdp_update_version
   else
     Chef::Application.fatal!('This cookbook only supports HDP 2.x')
   end