From 2f785833df8398f09e4d34ba86520a3b0632d261 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Mon, 21 Aug 2017 14:18:49 -0400 Subject: [PATCH] Fix CDH default templates The node_group_template_id for the cluster was not correct leading to templates not successfully being created due to the invalid value. In addition, there is no HDFS_NAMENODE defined and it seems that there should have been one at least. Change-Id: I54f3a41bf4f0a4ed952a5c712cbf70d3c1a92bcd Closes-Bug: #1712134 --- sahara/plugins/default_templates/cdh/v5_5_0/cluster.json | 2 +- sahara/plugins/default_templates/cdh/v5_5_0/master-core.json | 2 +- sahara/plugins/default_templates/cdh/v5_7_0/cluster.json | 2 +- sahara/plugins/default_templates/cdh/v5_7_0/master-core.json | 2 +- sahara/plugins/default_templates/cdh/v5_9_0/cluster.json | 2 +- sahara/plugins/default_templates/cdh/v5_9_0/master-core.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sahara/plugins/default_templates/cdh/v5_5_0/cluster.json b/sahara/plugins/default_templates/cdh/v5_5_0/cluster.json index 2a7669ce55..8fc62056a8 100644 --- a/sahara/plugins/default_templates/cdh/v5_5_0/cluster.json +++ b/sahara/plugins/default_templates/cdh/v5_5_0/cluster.json @@ -5,7 +5,7 @@ { "name": "worker-nodemanager-datanode", "count": 3, - "node_group_template_id": "{cdh-550-default-worker-nodemanager-datanode}" + "node_group_template_id": "{cdh-550-default-nodemanager-datanode}" }, { "name": "manager", diff --git a/sahara/plugins/default_templates/cdh/v5_5_0/master-core.json b/sahara/plugins/default_templates/cdh/v5_5_0/master-core.json index 825280b60b..8219216784 100644 --- a/sahara/plugins/default_templates/cdh/v5_5_0/master-core.json +++ b/sahara/plugins/default_templates/cdh/v5_5_0/master-core.json @@ -2,7 +2,7 @@ "plugin_name": "cdh", "hadoop_version": "5.5.0", "node_processes": [ - "HDFS_DATANODE", + "HDFS_NAMENODE", "YARN_RESOURCEMANAGER", "SENTRY_SERVER", "YARN_NODEMANAGER", diff --git a/sahara/plugins/default_templates/cdh/v5_7_0/cluster.json b/sahara/plugins/default_templates/cdh/v5_7_0/cluster.json index a53ba26abe..6dd9ee3805 100644 --- a/sahara/plugins/default_templates/cdh/v5_7_0/cluster.json +++ b/sahara/plugins/default_templates/cdh/v5_7_0/cluster.json @@ -5,7 +5,7 @@ { "name": "worker-nodemanager-datanode", "count": 3, - "node_group_template_id": "{cdh-570-default-worker-nodemanager-datanode}" + "node_group_template_id": "{cdh-570-default-nodemanager-datanode}" }, { "name": "manager", diff --git a/sahara/plugins/default_templates/cdh/v5_7_0/master-core.json b/sahara/plugins/default_templates/cdh/v5_7_0/master-core.json index 0b7369764e..1bbaa90f6d 100644 --- a/sahara/plugins/default_templates/cdh/v5_7_0/master-core.json +++ b/sahara/plugins/default_templates/cdh/v5_7_0/master-core.json @@ -2,7 +2,7 @@ "plugin_name": "cdh", "hadoop_version": "5.7.0", "node_processes": [ - "HDFS_DATANODE", + "HDFS_NAMENODE", "YARN_RESOURCEMANAGER", "SENTRY_SERVER", "YARN_NODEMANAGER", diff --git a/sahara/plugins/default_templates/cdh/v5_9_0/cluster.json b/sahara/plugins/default_templates/cdh/v5_9_0/cluster.json index d936351e37..cc85f264e8 100644 --- a/sahara/plugins/default_templates/cdh/v5_9_0/cluster.json +++ b/sahara/plugins/default_templates/cdh/v5_9_0/cluster.json @@ -5,7 +5,7 @@ { "name": "worker-nodemanager-datanode", "count": 3, - "node_group_template_id": "{cdh-590-default-worker-nodemanager-datanode}" + "node_group_template_id": "{cdh-590-default-nodemanager-datanode}" }, { "name": "manager", diff --git a/sahara/plugins/default_templates/cdh/v5_9_0/master-core.json b/sahara/plugins/default_templates/cdh/v5_9_0/master-core.json index 6a3abf8e55..be10803964 100644 --- a/sahara/plugins/default_templates/cdh/v5_9_0/master-core.json +++ b/sahara/plugins/default_templates/cdh/v5_9_0/master-core.json @@ -2,7 +2,7 @@ "plugin_name": "cdh", "hadoop_version": "5.9.0", "node_processes": [ - "HDFS_DATANODE", + "HDFS_NAMENODE", "YARN_RESOURCEMANAGER", "SENTRY_SERVER", "YARN_NODEMANAGER",