Merge pull request #214 from caskdata/feature/hdp2300-support

Support HDP 2.3.0.0
cdapio · Jul 30, 2015 · 0d18595 · 0d18595
2 parents 2c9855a + e0997b3
commit 0d18595
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -11,6 +11,6 @@ SingleSpaceBeforeFirstArg:
 AsciiComments:
   Enabled: false
 Metrics/CyclomaticComplexity:
-  Max: 7
+  Max: 10
 Metrics/MethodLength:
-  Max: 16
+  Max: 20
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -83,6 +83,8 @@
     '2.2.6.0-2800'
   when '2.2.6.3'
     '2.2.6.3-1'
+  when '2.3.0.0'
+    '2.3.0.0-2557'
   else
     node['hadoop']['distribution_version']
   end

diff --git a/attributes/tez.rb b/attributes/tez.rb
@@ -14,6 +14,8 @@
     '2.2.6.0-2800'
   when '2.2.6.3'
     '2.2.6.3-1'
+  when '2.3.0.0'
+    '2.3.0.0-2557'
   else
     node['hadoop']['distribution_version']
   end

diff --git a/libraries/helpers.rb b/libraries/helpers.rb
@@ -52,6 +52,8 @@ def hdp_version
         '2.2.6.0-2800'
       when '2.2.6.3'
         '2.2.6.3-1'
+      when '2.3.0.0'
+        '2.3.0.0-2557'
       else
         node['hadoop']['distribution_version']
       end

diff --git a/recipes/repo.rb b/recipes/repo.rb
@@ -60,14 +60,20 @@
     hdp_update_version = '2.1.15.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.2.1.0', '2.2.4.2', '2.2.4.4', '2.2.6.0', '2.2.6.3'
+  # 2.3.0.0 does not have its own base version
+  when '2.2.1.0', '2.2.4.2', '2.2.4.4', '2.2.6.0', '2.2.6.3', '2.3.0.0'
     hdp_version = '2.2.0.0'
     hdp_update_version = node['hadoop']['distribution_version']
-  when '2.2', '2'
+  when '2.2'
     hdp_version = '2.2.0.0'
     hdp_update_version = '2.2.6.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
+  when '2.3', '2'
+    hdp_version = '2.2.0.0'
+    hdp_update_version = '2.3.0.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
   else
     Chef::Application.fatal!('This cookbook only supports HDP 2.x')
   end