openstack/deb-sahara
Code Issues Proposed changes

Merge "Specify CDH version"

Browse Source
This commit is contained in:
Jenkins 2014-12-08 14:03:40 +00:00 committed by Gerrit Code Review
commit 3e1fbe3f48
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sahara/plugins/cdh/deploy.py
View File

@ -36,8 +36,6 @@ from sahara.utils import xmlutils
CM_API_PORT = 7180
CDH_VERSION = 'CDH5'
HDFS_SERVICE_TYPE = 'HDFS'
YARN_SERVICE_TYPE = 'YARN'
OOZIE_SERVICE_TYPE = 'OOZIE'
@ -353,7 +351,10 @@ def _start_cloudera_manager(cluster):
def _create_services(cluster):
api = cu.get_api_client(cluster)
cm_cluster = api.create_cluster(cluster.name, CDH_VERSION)
fullversion = ('5.0.0' if cluster.hadoop_version == '5'
else cluster.hadoop_version)
cm_cluster = api.create_cluster(cluster.name,
fullVersion=fullversion)
if len(pu.get_zookeepers(cluster)) > 0:
cm_cluster.create_service(cu.ZOOKEEPER_SERVICE_NAME,

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

@ -37,7 +37,7 @@ class CDHPluginProvider(p.ProvisioningPluginBase):
'(CDH) with Cloudera Manager management console.')
def get_versions(self):
return ['5']
return ['5', '5.2.0']
def get_node_processes(self, hadoop_version):
return {