git commit: AMBARI-8021. Adds Blueprint export handling for Knox and Zookeeper properties in HDP 2.2 stack

2014-10-30 Thread jspeidel 
Repository: ambari
Updated Branches:
  refs/heads/trunk d8e8a0915 -> ce69d0077


AMBARI-8021.  Adds Blueprint export handling for Knox and Zookeeper properties 
in HDP 2.2 stack


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ce69d007
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce69d007
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce69d007

Branch: refs/heads/trunk
Commit: ce69d0077c9f45f9ad0824a40352771604b3b17a
Parents: d8e8a09
Author: Robert Nettleton 
Authored: Thu Oct 30 11:52:11 2014 -0400
Committer: John Speidel 
Committed: Thu Oct 30 13:39:08 2014 -0400

--
 .../BlueprintConfigurationProcessor.java|  25 
 .../BlueprintConfigurationProcessorTest.java| 137 +++
 2 files changed, 162 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ce69d007/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index be379c9..9237bc9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -882,6 +882,8 @@ public class BlueprintConfigurationProcessor {
 Map oozieSiteMap = new HashMap();
 Map stormSiteMap = new HashMap();
 Map falconStartupPropertiesMap = new 
HashMap();
+Map kafkaBrokerMap = new HashMap();
+
 
 
 Map mapredEnvMap = new HashMap();
@@ -898,6 +900,13 @@ public class BlueprintConfigurationProcessor {
 Map multiCoreSiteMap = new HashMap();
 Map multiHdfsSiteMap = new HashMap();
 Map multiHiveSiteMap = new HashMap();
+Map multiKafkaBrokerMap = new HashMap();
+Map multiSliderClientMap = new HashMap();
+Map multiYarnSiteMap = new HashMap();
+Map multiOozieSiteMap = new HashMap();
+
+
+
 
 
 Map dbHiveSiteMap = new HashMap();
@@ -917,6 +926,7 @@ public class BlueprintConfigurationProcessor {
 singleHostTopologyUpdaters.put("nagios-env", nagiosEnvMap);
 singleHostTopologyUpdaters.put("hive-env", hiveEnvMap);
 singleHostTopologyUpdaters.put("oozie-env", oozieEnvMap);
+singleHostTopologyUpdaters.put("kafka-broker", kafkaBrokerMap);
 
 mPropertyUpdaters.put("hadoop-env", hadoopEnvMap);
 mPropertyUpdaters.put("hbase-env", hbaseEnvMap);
@@ -928,6 +938,10 @@ public class BlueprintConfigurationProcessor {
 multiHostTopologyUpdaters.put("core-site", multiCoreSiteMap);
 multiHostTopologyUpdaters.put("hdfs-site", multiHdfsSiteMap);
 multiHostTopologyUpdaters.put("hive-site", multiHiveSiteMap);
+multiHostTopologyUpdaters.put("kafka-broker", multiKafkaBrokerMap);
+multiHostTopologyUpdaters.put("slider-client", multiSliderClientMap);
+multiHostTopologyUpdaters.put("yarn-site", multiYarnSiteMap);
+multiHostTopologyUpdaters.put("oozie-site", multiOozieSiteMap);
 
 dbHostTopologyUpdaters.put("hive-site", dbHiveSiteMap);
 
@@ -1000,6 +1014,9 @@ public class BlueprintConfigurationProcessor {
 multiHbaseSiteMap.put("hbase.zookeeper.quorum", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
 multiWebhcatSiteMap.put("templeton.zookeeper.hosts", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
 multiCoreSiteMap.put("ha.zookeeper.quorum", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
+multiYarnSiteMap.put("hadoop.registry.zk.quorum", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
+multiSliderClientMap.put("slider.zookeeper.quorum", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
+multiKafkaBrokerMap.put("zookeeper.connect", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
 
 // STORM
 stormSiteMap.put("nimbus.host", new SingleHostTopologyUpdater("NIMBUS"));
@@ -1018,6 +1035,14 @@ public class BlueprintConfigurationProcessor {
 // NAGIOS
 nagiosEnvMap.put("nagios_principal_name", new 
SingleHostTopologyUpdater("NAGIOS_SERVER"));
 
+// KAFKA
+kafkaBrokerMap.put("kafka.ganglia.metrics.host", new 
SingleHostTopologyUpdater("GANGLIA_SERVER"));
+
+// KNOX
+multiCoreSiteMap.put("hadoop.proxyuser.knox.hosts", new 
MultipleHostTopologyUpdater("KNOX_GATEWAY"));
+multiWebhcatSiteMap.put("webhcat.proxyuser.knox.hosts", new 
MultipleHostTopologyUpdater("KNOX_GATEWAY"));
+multiOozieSiteMap.put("hadoop.proxyuser.knox.hosts", new 
MultipleHostTopologyUpdater("KNOX_GATEWAY"));
+
 
 // Required due to AMBARI-4933.

git commit: AMBARI-8021. Adds Blueprint export handling for Knox and Zookeeper properties in HDP 2.2 stack

2014-10-30 Thread jspeidel 
Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 ce051947e -> 8fa3ea45a


AMBARI-8021.  Adds Blueprint export handling for Knox and Zookeeper properties 
in HDP 2.2 stack


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8fa3ea45
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8fa3ea45
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8fa3ea45

Branch: refs/heads/branch-1.7.0
Commit: 8fa3ea45a23c3b4b455252853fb7c24d95121f45
Parents: ce05194
Author: Robert Nettleton 
Authored: Thu Oct 30 11:52:11 2014 -0400
Committer: John Speidel 
Committed: Thu Oct 30 12:33:55 2014 -0400

--
 .../BlueprintConfigurationProcessor.java|  25 
 .../BlueprintConfigurationProcessorTest.java| 137 +++
 2 files changed, 162 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8fa3ea45/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index be379c9..9237bc9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -882,6 +882,8 @@ public class BlueprintConfigurationProcessor {
 Map oozieSiteMap = new HashMap();
 Map stormSiteMap = new HashMap();
 Map falconStartupPropertiesMap = new 
HashMap();
+Map kafkaBrokerMap = new HashMap();
+
 
 
 Map mapredEnvMap = new HashMap();
@@ -898,6 +900,13 @@ public class BlueprintConfigurationProcessor {
 Map multiCoreSiteMap = new HashMap();
 Map multiHdfsSiteMap = new HashMap();
 Map multiHiveSiteMap = new HashMap();
+Map multiKafkaBrokerMap = new HashMap();
+Map multiSliderClientMap = new HashMap();
+Map multiYarnSiteMap = new HashMap();
+Map multiOozieSiteMap = new HashMap();
+
+
+
 
 
 Map dbHiveSiteMap = new HashMap();
@@ -917,6 +926,7 @@ public class BlueprintConfigurationProcessor {
 singleHostTopologyUpdaters.put("nagios-env", nagiosEnvMap);
 singleHostTopologyUpdaters.put("hive-env", hiveEnvMap);
 singleHostTopologyUpdaters.put("oozie-env", oozieEnvMap);
+singleHostTopologyUpdaters.put("kafka-broker", kafkaBrokerMap);
 
 mPropertyUpdaters.put("hadoop-env", hadoopEnvMap);
 mPropertyUpdaters.put("hbase-env", hbaseEnvMap);
@@ -928,6 +938,10 @@ public class BlueprintConfigurationProcessor {
 multiHostTopologyUpdaters.put("core-site", multiCoreSiteMap);
 multiHostTopologyUpdaters.put("hdfs-site", multiHdfsSiteMap);
 multiHostTopologyUpdaters.put("hive-site", multiHiveSiteMap);
+multiHostTopologyUpdaters.put("kafka-broker", multiKafkaBrokerMap);
+multiHostTopologyUpdaters.put("slider-client", multiSliderClientMap);
+multiHostTopologyUpdaters.put("yarn-site", multiYarnSiteMap);
+multiHostTopologyUpdaters.put("oozie-site", multiOozieSiteMap);
 
 dbHostTopologyUpdaters.put("hive-site", dbHiveSiteMap);
 
@@ -1000,6 +1014,9 @@ public class BlueprintConfigurationProcessor {
 multiHbaseSiteMap.put("hbase.zookeeper.quorum", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
 multiWebhcatSiteMap.put("templeton.zookeeper.hosts", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
 multiCoreSiteMap.put("ha.zookeeper.quorum", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
+multiYarnSiteMap.put("hadoop.registry.zk.quorum", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
+multiSliderClientMap.put("slider.zookeeper.quorum", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
+multiKafkaBrokerMap.put("zookeeper.connect", new 
MultipleHostTopologyUpdater("ZOOKEEPER_SERVER"));
 
 // STORM
 stormSiteMap.put("nimbus.host", new SingleHostTopologyUpdater("NIMBUS"));
@@ -1018,6 +1035,14 @@ public class BlueprintConfigurationProcessor {
 // NAGIOS
 nagiosEnvMap.put("nagios_principal_name", new 
SingleHostTopologyUpdater("NAGIOS_SERVER"));
 
+// KAFKA
+kafkaBrokerMap.put("kafka.ganglia.metrics.host", new 
SingleHostTopologyUpdater("GANGLIA_SERVER"));
+
+// KNOX
+multiCoreSiteMap.put("hadoop.proxyuser.knox.hosts", new 
MultipleHostTopologyUpdater("KNOX_GATEWAY"));
+multiWebhcatSiteMap.put("webhcat.proxyuser.knox.hosts", new 
MultipleHostTopologyUpdater("KNOX_GATEWAY"));
+multiOozieSiteMap.put("hadoop.proxyuser.knox.hosts", new 
MultipleHostTopologyUpdater("KNOX_GATEWAY"));
+
 
 // Required due to