openstack/deb-sahara
Code Issues Proposed changes

Remove support of HDP 2.2

Browse Source 
Ambari plugin didn't enabled by default in Sahara.
And current supported version of HDP is 2.3.
Hence we can remove support of HDP 2.2

Change-Id: Ic453e889a55d5e321d63bdb8bd0a4bbf4c384797
This commit is contained in:
Michael Ionkin 2016-02-12 16:56:05 +03:00
parent 1c63e1b3ad
commit a47e592a73
5 changed files with 3 additions and 1252 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sahara/plugins/ambari/deploy.py
View File

@ -36,10 +36,6 @@ conductor = conductor.API
repo_id_map = {
"2.2": {
"HDP": "HDP-2.2",
"HDP-UTILS": "HDP-UTILS-1.1.0.20"
},
"2.3": {
"HDP": "HDP-2.3",
"HDP-UTILS": "HDP-UTILS-1.1.0.20"

2
sahara/plugins/ambari/plugin.py
View File

@ -39,7 +39,7 @@ class AmbariPluginProvider(p.ProvisioningPluginBase):
return _("HDP plugin with Ambari")
def get_versions(self):
return ["2.3", "2.2"]
return ["2.3"]
def get_node_processes(self, hadoop_version):
return {

1242
sahara/plugins/ambari/resources/configs-2.2.json
View File

File diff suppressed because it is too large Load Diff

4
sahara/tests/unit/plugins/ambari/test_configs.py
View File

@ -25,11 +25,11 @@ from sahara.tests.unit import base
class AmbariConfigsTestCase(base.SaharaTestCase):
def setUp(self):
super(AmbariConfigsTestCase, self).setUp()
configs.load_configs("2.2")
configs.load_configs("2.3")
self.ng = mock.Mock()
self.ng.node_configs = {}
self.ng.cluster = mock.Mock()
self.ng.cluster.hadoop_version = "2.2"
self.ng.cluster.hadoop_version = "2.3"
self.instance = mock.Mock()
self.instance.node_group = self.ng
self.instance.storage_paths = mock.Mock()

3
sahara/tests/unit/plugins/ambari/test_plugin.py
View File

@ -24,9 +24,6 @@ class TestPlugin(test_base.SaharaTestCase):
def test_job_types(self):
self.assertEqual({
'2.2': [
'Hive', 'Java', 'MapReduce', 'MapReduce.Streaming',
'Pig', 'Shell', 'Spark'],
'2.3': [
'Hive', 'Java', 'MapReduce', 'MapReduce.Streaming',
'Pig', 'Shell', 'Spark']