[03/51] [abbrv] ambari git commit: AMBARI-18804. Manage Ambari principals should be set to off when upgrading Ambari from versions < 2.4.0 (rlevas)

2017-03-27 Thread rzang 
AMBARI-18804. Manage Ambari principals should be set to off when upgrading 
Ambari from versions < 2.4.0 (rlevas)

(cherry picked from commit 3a0d571befd05615130ef3a63ce72f176dba60e8)

Change-Id: I6577b195126e10435485069d1356770577f18211


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

Branch: refs/heads/AMBARI-2.4.2.16
Commit: c32941bfc39cb4fcfac12fceb67d4ab2da717248
Parents: 85e3e33
Author: Robert Levas 
Authored: Mon Nov 7 12:38:25 2016 -0500
Committer: Zuul 
Committed: Tue Nov 8 16:59:45 2016 -0800

--
 .../server/upgrade/UpgradeCatalog240.java   | 20 +---
 .../server/upgrade/UpgradeCatalog240Test.java   |  6 ++
 2 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c32941bf/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index dab20a0..b711c25 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -19,8 +19,6 @@
 package org.apache.ambari.server.upgrade;
 
 import com.google.common.collect.Lists;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -48,7 +46,6 @@ import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
 import org.apache.ambari.server.orm.dao.RoleAuthorizationDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
-import org.apache.ambari.server.orm.dao.WidgetDAO;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.orm.entities.ArtifactEntity;
 import org.apache.ambari.server.orm.entities.ClusterEntity;
@@ -64,7 +61,6 @@ import 
org.apache.ambari.server.orm.entities.RoleAuthorizationEntity;
 import org.apache.ambari.server.orm.entities.UserEntity;
 import org.apache.ambari.server.orm.entities.ViewEntityEntity;
 import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
-import org.apache.ambari.server.orm.entities.WidgetEntity;
 import org.apache.ambari.server.security.authorization.ResourceType;
 import org.apache.ambari.server.security.authorization.User;
 import org.apache.ambari.server.security.authorization.Users;
@@ -87,8 +83,6 @@ import 
org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosKeytabDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosPrincipalDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
-import org.apache.ambari.server.state.stack.WidgetLayout;
-import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
 import org.apache.ambari.server.view.DefaultMasker;
 import org.apache.ambari.view.ClusterType;
 import org.apache.ambari.view.MaskException;
@@ -100,9 +94,6 @@ import org.springframework.jdbc.support.JdbcUtils;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import java.io.File;
-import java.io.FileReader;
-import java.lang.reflect.Type;
 import java.sql.Clob;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -2216,10 +2207,17 @@ public class UpgradeCatalog240 extends 
AbstractUpgradeCatalog {
   // Update the kerberos-env properties to change kdc_host to kdc_hosts
   config = cluster.getDesiredConfigByType("kerberos-env");
   if (config != null) {
+Map updates = new HashMap();
+Set removes = new HashSet();
+
 // Rename kdc_host to kdc_hosts
 String value = config.getProperties().get("kdc_host");
-Map updates = Collections.singletonMap("kdc_hosts", 
value);
-Set removes = Collections.singleton("kdc_host");
+updates.put("kdc_hosts", value);
+removes.add("kdc_host");
+
+// Ensure create_ambari_principal is set to "false" since it is 
expected that Ambari's
+// principal, keytab file, and JAAS file has already been manually 
configured.
+updates.put("create_ambari_principal", "false");
 
 updateConfigurationPropertiesForCluster(cluster, "kerberos-env", 
updates, removes, true,

[01/50] [abbrv] ambari git commit: AMBARI-18804. Manage Ambari principals should be set to off when upgrading Ambari from versions < 2.4.0 (rlevas)

2016-11-10 Thread jonathanhurley 
Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-18456 66259872f -> cda44fe2f


AMBARI-18804. Manage Ambari principals should be set to off when upgrading 
Ambari from versions < 2.4.0 (rlevas)


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

Branch: refs/heads/branch-feature-AMBARI-18456
Commit: a17c3ed2f285df3c974c6fc5002e5ad728e45a56
Parents: d99df76
Author: Robert Levas 
Authored: Mon Nov 7 12:35:42 2016 -0500
Committer: Robert Levas 
Committed: Mon Nov 7 12:35:42 2016 -0500

--
 .../server/upgrade/UpgradeCatalog240.java   | 20 +---
 .../server/upgrade/UpgradeCatalog240Test.java   |  6 ++
 2 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a17c3ed2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index 54afd8d..c113fff 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -19,8 +19,6 @@
 package org.apache.ambari.server.upgrade;
 
 import com.google.common.collect.Lists;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -48,7 +46,6 @@ import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
 import org.apache.ambari.server.orm.dao.RoleAuthorizationDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
-import org.apache.ambari.server.orm.dao.WidgetDAO;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.orm.entities.ArtifactEntity;
 import org.apache.ambari.server.orm.entities.ClusterEntity;
@@ -64,7 +61,6 @@ import 
org.apache.ambari.server.orm.entities.RoleAuthorizationEntity;
 import org.apache.ambari.server.orm.entities.UserEntity;
 import org.apache.ambari.server.orm.entities.ViewEntityEntity;
 import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
-import org.apache.ambari.server.orm.entities.WidgetEntity;
 import org.apache.ambari.server.security.authorization.ResourceType;
 import org.apache.ambari.server.security.authorization.User;
 import org.apache.ambari.server.security.authorization.Users;
@@ -87,8 +83,6 @@ import 
org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosKeytabDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosPrincipalDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
-import org.apache.ambari.server.state.stack.WidgetLayout;
-import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
 import org.apache.ambari.server.view.DefaultMasker;
 import org.apache.ambari.view.ClusterType;
 import org.apache.ambari.view.MaskException;
@@ -100,9 +94,6 @@ import org.springframework.jdbc.support.JdbcUtils;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import java.io.File;
-import java.io.FileReader;
-import java.lang.reflect.Type;
 import java.sql.Clob;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -2256,10 +2247,17 @@ public class UpgradeCatalog240 extends 
AbstractUpgradeCatalog {
   // Update the kerberos-env properties to change kdc_host to kdc_hosts
   config = cluster.getDesiredConfigByType("kerberos-env");
   if (config != null) {
+Map updates = new HashMap();
+Set removes = new HashSet();
+
 // Rename kdc_host to kdc_hosts
 String value = config.getProperties().get("kdc_host");
-Map updates = Collections.singletonMap("kdc_hosts", 
value);
-Set removes = Collections.singleton("kdc_host");
+updates.put("kdc_hosts", value);
+removes.add("kdc_host");
+
+// Ensure create_ambari_principal is set to "false" since it is 
expected that Ambari's
+// principal, keytab file, and JAAS file has already been manually 
configured.
+updates.put("create_ambari_principal", "false");
 
 updateConfigurationPropertiesForCluster(cluster, "kerberos-env", 
updates, removes, true,

[05/22] ambari git commit: AMBARI-18804. Manage Ambari principals should be set to off when upgrading Ambari from versions < 2.4.0 (rlevas)

2016-11-08 Thread ncole 
AMBARI-18804. Manage Ambari principals should be set to off when upgrading 
Ambari from versions < 2.4.0 (rlevas)


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

Branch: refs/heads/branch-feature-AMBARI-18634
Commit: a17c3ed2f285df3c974c6fc5002e5ad728e45a56
Parents: d99df76
Author: Robert Levas 
Authored: Mon Nov 7 12:35:42 2016 -0500
Committer: Robert Levas 
Committed: Mon Nov 7 12:35:42 2016 -0500

--
 .../server/upgrade/UpgradeCatalog240.java   | 20 +---
 .../server/upgrade/UpgradeCatalog240Test.java   |  6 ++
 2 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a17c3ed2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index 54afd8d..c113fff 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -19,8 +19,6 @@
 package org.apache.ambari.server.upgrade;
 
 import com.google.common.collect.Lists;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -48,7 +46,6 @@ import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
 import org.apache.ambari.server.orm.dao.RoleAuthorizationDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
-import org.apache.ambari.server.orm.dao.WidgetDAO;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.orm.entities.ArtifactEntity;
 import org.apache.ambari.server.orm.entities.ClusterEntity;
@@ -64,7 +61,6 @@ import 
org.apache.ambari.server.orm.entities.RoleAuthorizationEntity;
 import org.apache.ambari.server.orm.entities.UserEntity;
 import org.apache.ambari.server.orm.entities.ViewEntityEntity;
 import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
-import org.apache.ambari.server.orm.entities.WidgetEntity;
 import org.apache.ambari.server.security.authorization.ResourceType;
 import org.apache.ambari.server.security.authorization.User;
 import org.apache.ambari.server.security.authorization.Users;
@@ -87,8 +83,6 @@ import 
org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosKeytabDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosPrincipalDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
-import org.apache.ambari.server.state.stack.WidgetLayout;
-import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
 import org.apache.ambari.server.view.DefaultMasker;
 import org.apache.ambari.view.ClusterType;
 import org.apache.ambari.view.MaskException;
@@ -100,9 +94,6 @@ import org.springframework.jdbc.support.JdbcUtils;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import java.io.File;
-import java.io.FileReader;
-import java.lang.reflect.Type;
 import java.sql.Clob;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -2256,10 +2247,17 @@ public class UpgradeCatalog240 extends 
AbstractUpgradeCatalog {
   // Update the kerberos-env properties to change kdc_host to kdc_hosts
   config = cluster.getDesiredConfigByType("kerberos-env");
   if (config != null) {
+Map updates = new HashMap();
+Set removes = new HashSet();
+
 // Rename kdc_host to kdc_hosts
 String value = config.getProperties().get("kdc_host");
-Map updates = Collections.singletonMap("kdc_hosts", 
value);
-Set removes = Collections.singleton("kdc_host");
+updates.put("kdc_hosts", value);
+removes.add("kdc_host");
+
+// Ensure create_ambari_principal is set to "false" since it is 
expected that Ambari's
+// principal, keytab file, and JAAS file has already been manually 
configured.
+updates.put("create_ambari_principal", "false");
 
 updateConfigurationPropertiesForCluster(cluster, "kerberos-env", 
updates, removes, true, false);
   }

[50/55] [abbrv] ambari git commit: AMBARI-18804. Manage Ambari principals should be set to off when upgrading Ambari from versions < 2.4.0 (rlevas)

2016-11-07 Thread ncole 
AMBARI-18804. Manage Ambari principals should be set to off when upgrading 
Ambari from versions < 2.4.0 (rlevas)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: a17c3ed2f285df3c974c6fc5002e5ad728e45a56
Parents: d99df76
Author: Robert Levas 
Authored: Mon Nov 7 12:35:42 2016 -0500
Committer: Robert Levas 
Committed: Mon Nov 7 12:35:42 2016 -0500

--
 .../server/upgrade/UpgradeCatalog240.java   | 20 +---
 .../server/upgrade/UpgradeCatalog240Test.java   |  6 ++
 2 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a17c3ed2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index 54afd8d..c113fff 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -19,8 +19,6 @@
 package org.apache.ambari.server.upgrade;
 
 import com.google.common.collect.Lists;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -48,7 +46,6 @@ import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
 import org.apache.ambari.server.orm.dao.RoleAuthorizationDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
-import org.apache.ambari.server.orm.dao.WidgetDAO;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.orm.entities.ArtifactEntity;
 import org.apache.ambari.server.orm.entities.ClusterEntity;
@@ -64,7 +61,6 @@ import 
org.apache.ambari.server.orm.entities.RoleAuthorizationEntity;
 import org.apache.ambari.server.orm.entities.UserEntity;
 import org.apache.ambari.server.orm.entities.ViewEntityEntity;
 import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
-import org.apache.ambari.server.orm.entities.WidgetEntity;
 import org.apache.ambari.server.security.authorization.ResourceType;
 import org.apache.ambari.server.security.authorization.User;
 import org.apache.ambari.server.security.authorization.Users;
@@ -87,8 +83,6 @@ import 
org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosKeytabDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosPrincipalDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
-import org.apache.ambari.server.state.stack.WidgetLayout;
-import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
 import org.apache.ambari.server.view.DefaultMasker;
 import org.apache.ambari.view.ClusterType;
 import org.apache.ambari.view.MaskException;
@@ -100,9 +94,6 @@ import org.springframework.jdbc.support.JdbcUtils;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import java.io.File;
-import java.io.FileReader;
-import java.lang.reflect.Type;
 import java.sql.Clob;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -2256,10 +2247,17 @@ public class UpgradeCatalog240 extends 
AbstractUpgradeCatalog {
   // Update the kerberos-env properties to change kdc_host to kdc_hosts
   config = cluster.getDesiredConfigByType("kerberos-env");
   if (config != null) {
+Map updates = new HashMap();
+Set removes = new HashSet();
+
 // Rename kdc_host to kdc_hosts
 String value = config.getProperties().get("kdc_host");
-Map updates = Collections.singletonMap("kdc_hosts", 
value);
-Set removes = Collections.singleton("kdc_host");
+updates.put("kdc_hosts", value);
+removes.add("kdc_host");
+
+// Ensure create_ambari_principal is set to "false" since it is 
expected that Ambari's
+// principal, keytab file, and JAAS file has already been manually 
configured.
+updates.put("create_ambari_principal", "false");
 
 updateConfigurationPropertiesForCluster(cluster, "kerberos-env", 
updates, removes, true, false);
   }

ambari git commit: AMBARI-18804. Manage Ambari principals should be set to off when upgrading Ambari from versions < 2.4.0 (rlevas)

2016-11-07 Thread rlevas 
Repository: ambari
Updated Branches:
  refs/heads/trunk d99df76a8 -> a17c3ed2f


AMBARI-18804. Manage Ambari principals should be set to off when upgrading 
Ambari from versions < 2.4.0 (rlevas)


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

Branch: refs/heads/trunk
Commit: a17c3ed2f285df3c974c6fc5002e5ad728e45a56
Parents: d99df76
Author: Robert Levas 
Authored: Mon Nov 7 12:35:42 2016 -0500
Committer: Robert Levas 
Committed: Mon Nov 7 12:35:42 2016 -0500

--
 .../server/upgrade/UpgradeCatalog240.java   | 20 +---
 .../server/upgrade/UpgradeCatalog240Test.java   |  6 ++
 2 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a17c3ed2/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index 54afd8d..c113fff 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -19,8 +19,6 @@
 package org.apache.ambari.server.upgrade;
 
 import com.google.common.collect.Lists;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -48,7 +46,6 @@ import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
 import org.apache.ambari.server.orm.dao.RoleAuthorizationDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
-import org.apache.ambari.server.orm.dao.WidgetDAO;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.orm.entities.ArtifactEntity;
 import org.apache.ambari.server.orm.entities.ClusterEntity;
@@ -64,7 +61,6 @@ import 
org.apache.ambari.server.orm.entities.RoleAuthorizationEntity;
 import org.apache.ambari.server.orm.entities.UserEntity;
 import org.apache.ambari.server.orm.entities.ViewEntityEntity;
 import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
-import org.apache.ambari.server.orm.entities.WidgetEntity;
 import org.apache.ambari.server.security.authorization.ResourceType;
 import org.apache.ambari.server.security.authorization.User;
 import org.apache.ambari.server.security.authorization.Users;
@@ -87,8 +83,6 @@ import 
org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosKeytabDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosPrincipalDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
-import org.apache.ambari.server.state.stack.WidgetLayout;
-import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
 import org.apache.ambari.server.view.DefaultMasker;
 import org.apache.ambari.view.ClusterType;
 import org.apache.ambari.view.MaskException;
@@ -100,9 +94,6 @@ import org.springframework.jdbc.support.JdbcUtils;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import java.io.File;
-import java.io.FileReader;
-import java.lang.reflect.Type;
 import java.sql.Clob;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -2256,10 +2247,17 @@ public class UpgradeCatalog240 extends 
AbstractUpgradeCatalog {
   // Update the kerberos-env properties to change kdc_host to kdc_hosts
   config = cluster.getDesiredConfigByType("kerberos-env");
   if (config != null) {
+Map updates = new HashMap();
+Set removes = new HashSet();
+
 // Rename kdc_host to kdc_hosts
 String value = config.getProperties().get("kdc_host");
-Map updates = Collections.singletonMap("kdc_hosts", 
value);
-Set removes = Collections.singleton("kdc_host");
+updates.put("kdc_hosts", value);
+removes.add("kdc_host");
+
+// Ensure create_ambari_principal is set to "false" since it is 
expected that Ambari's
+// principal, keytab file, and JAAS file has already been manually 
configured.
+updates.put("create_ambari_principal", "false");
 
 updateConfigurationPropertiesForCluster(cluster, "kerberos-env", 
updates, removes, true, false);
   }

ambari git commit: AMBARI-18804. Manage Ambari principals should be set to off when upgrading Ambari from versions < 2.4.0 (rlevas)

2016-11-07 Thread rlevas 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 d314e3478 -> 3a0d571be


AMBARI-18804. Manage Ambari principals should be set to off when upgrading 
Ambari from versions < 2.4.0 (rlevas)


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

Branch: refs/heads/branch-2.4
Commit: 3a0d571befd05615130ef3a63ce72f176dba60e8
Parents: d314e34
Author: Robert Levas 
Authored: Mon Nov 7 12:38:25 2016 -0500
Committer: Robert Levas 
Committed: Mon Nov 7 12:38:25 2016 -0500

--
 .../server/upgrade/UpgradeCatalog240.java   | 20 +---
 .../server/upgrade/UpgradeCatalog240Test.java   |  6 ++
 2 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3a0d571b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index dab20a0..b711c25 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -19,8 +19,6 @@
 package org.apache.ambari.server.upgrade;
 
 import com.google.common.collect.Lists;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -48,7 +46,6 @@ import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
 import org.apache.ambari.server.orm.dao.RoleAuthorizationDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
-import org.apache.ambari.server.orm.dao.WidgetDAO;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.orm.entities.ArtifactEntity;
 import org.apache.ambari.server.orm.entities.ClusterEntity;
@@ -64,7 +61,6 @@ import 
org.apache.ambari.server.orm.entities.RoleAuthorizationEntity;
 import org.apache.ambari.server.orm.entities.UserEntity;
 import org.apache.ambari.server.orm.entities.ViewEntityEntity;
 import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
-import org.apache.ambari.server.orm.entities.WidgetEntity;
 import org.apache.ambari.server.security.authorization.ResourceType;
 import org.apache.ambari.server.security.authorization.User;
 import org.apache.ambari.server.security.authorization.Users;
@@ -87,8 +83,6 @@ import 
org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosKeytabDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosPrincipalDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
-import org.apache.ambari.server.state.stack.WidgetLayout;
-import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
 import org.apache.ambari.server.view.DefaultMasker;
 import org.apache.ambari.view.ClusterType;
 import org.apache.ambari.view.MaskException;
@@ -100,9 +94,6 @@ import org.springframework.jdbc.support.JdbcUtils;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import java.io.File;
-import java.io.FileReader;
-import java.lang.reflect.Type;
 import java.sql.Clob;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -2216,10 +2207,17 @@ public class UpgradeCatalog240 extends 
AbstractUpgradeCatalog {
   // Update the kerberos-env properties to change kdc_host to kdc_hosts
   config = cluster.getDesiredConfigByType("kerberos-env");
   if (config != null) {
+Map updates = new HashMap();
+Set removes = new HashSet();
+
 // Rename kdc_host to kdc_hosts
 String value = config.getProperties().get("kdc_host");
-Map updates = Collections.singletonMap("kdc_hosts", 
value);
-Set removes = Collections.singleton("kdc_host");
+updates.put("kdc_hosts", value);
+removes.add("kdc_host");
+
+// Ensure create_ambari_principal is set to "false" since it is 
expected that Ambari's
+// principal, keytab file, and JAAS file has already been manually 
configured.
+updates.put("create_ambari_principal", "false");
 
 updateConfigurationPropertiesForCluster(cluster, "kerberos-env", 
updates, removes, true, false);
   }

ambari git commit: AMBARI-18804. Manage Ambari principals should be set to off when upgrading Ambari from versions < 2.4.0 (rlevas)

2016-11-07 Thread rlevas 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 6ebd84875 -> fb86a2b67


AMBARI-18804. Manage Ambari principals should be set to off when upgrading 
Ambari from versions < 2.4.0 (rlevas)


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

Branch: refs/heads/branch-2.5
Commit: fb86a2b67ce728054ea3f43f4f8a5ae65df36cc8
Parents: 6ebd848
Author: Robert Levas 
Authored: Mon Nov 7 12:37:10 2016 -0500
Committer: Robert Levas 
Committed: Mon Nov 7 12:37:10 2016 -0500

--
 .../server/upgrade/UpgradeCatalog240.java   | 20 +---
 .../server/upgrade/UpgradeCatalog240Test.java   |  6 ++
 2 files changed, 15 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fb86a2b6/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
index dab20a0..b711c25 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog240.java
@@ -19,8 +19,6 @@
 package org.apache.ambari.server.upgrade;
 
 import com.google.common.collect.Lists;
-import com.google.common.reflect.TypeToken;
-import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
@@ -48,7 +46,6 @@ import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
 import org.apache.ambari.server.orm.dao.RoleAuthorizationDAO;
 import org.apache.ambari.server.orm.dao.UserDAO;
 import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
-import org.apache.ambari.server.orm.dao.WidgetDAO;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.orm.entities.ArtifactEntity;
 import org.apache.ambari.server.orm.entities.ClusterEntity;
@@ -64,7 +61,6 @@ import 
org.apache.ambari.server.orm.entities.RoleAuthorizationEntity;
 import org.apache.ambari.server.orm.entities.UserEntity;
 import org.apache.ambari.server.orm.entities.ViewEntityEntity;
 import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
-import org.apache.ambari.server.orm.entities.WidgetEntity;
 import org.apache.ambari.server.security.authorization.ResourceType;
 import org.apache.ambari.server.security.authorization.User;
 import org.apache.ambari.server.security.authorization.Users;
@@ -87,8 +83,6 @@ import 
org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosKeytabDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosPrincipalDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
-import org.apache.ambari.server.state.stack.WidgetLayout;
-import org.apache.ambari.server.state.stack.WidgetLayoutInfo;
 import org.apache.ambari.server.view.DefaultMasker;
 import org.apache.ambari.view.ClusterType;
 import org.apache.ambari.view.MaskException;
@@ -100,9 +94,6 @@ import org.springframework.jdbc.support.JdbcUtils;
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import java.io.File;
-import java.io.FileReader;
-import java.lang.reflect.Type;
 import java.sql.Clob;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -2216,10 +2207,17 @@ public class UpgradeCatalog240 extends 
AbstractUpgradeCatalog {
   // Update the kerberos-env properties to change kdc_host to kdc_hosts
   config = cluster.getDesiredConfigByType("kerberos-env");
   if (config != null) {
+Map updates = new HashMap();
+Set removes = new HashSet();
+
 // Rename kdc_host to kdc_hosts
 String value = config.getProperties().get("kdc_host");
-Map updates = Collections.singletonMap("kdc_hosts", 
value);
-Set removes = Collections.singleton("kdc_host");
+updates.put("kdc_hosts", value);
+removes.add("kdc_host");
+
+// Ensure create_ambari_principal is set to "false" since it is 
expected that Ambari's
+// principal, keytab file, and JAAS file has already been manually 
configured.
+updates.put("create_ambari_principal", "false");
 
 updateConfigurationPropertiesForCluster(cluster, "kerberos-env", 
updates, removes, true, false);
   }