[01/50] [abbrv] ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

2017-10-19 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-3.0-perf 7da02bb9f -> af30ab409


AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)


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

Branch: refs/heads/branch-3.0-perf
Commit: c3f6ba7621963b1086b7d9754d49b8663c7892b5
Parents: 3acfa5c
Author: Dmytro Sen 
Authored: Thu Oct 12 13:52:31 2017 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 12 13:52:31 2017 +0300

--
 ambari-server/src/main/assemblies/server.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c3f6ba76/ambari-server/src/main/assemblies/server.xml
--
diff --git a/ambari-server/src/main/assemblies/server.xml 
b/ambari-server/src/main/assemblies/server.xml
index 3079d1b..37283fa 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -392,6 +392,11 @@
   /var/lib/ambari-server/resources
 
 
+  755
+  src/main/resources/kerberos.json
+  /var/lib/ambari-server/resources
+
+
   644
   src/main/resources/slider_resources/README.txt
   /var/lib/ambari-server/resources/apps

[14/50] ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

2017-10-17 Thread amagyar 
AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)


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

Branch: refs/heads/branch-feature-AMBARI-22008
Commit: c3f6ba7621963b1086b7d9754d49b8663c7892b5
Parents: 3acfa5c
Author: Dmytro Sen 
Authored: Thu Oct 12 13:52:31 2017 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 12 13:52:31 2017 +0300

--
 ambari-server/src/main/assemblies/server.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c3f6ba76/ambari-server/src/main/assemblies/server.xml
--
diff --git a/ambari-server/src/main/assemblies/server.xml 
b/ambari-server/src/main/assemblies/server.xml
index 3079d1b..37283fa 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -392,6 +392,11 @@
   /var/lib/ambari-server/resources
 
 
+  755
+  src/main/resources/kerberos.json
+  /var/lib/ambari-server/resources
+
+
   644
   src/main/resources/slider_resources/README.txt
   /var/lib/ambari-server/resources/apps

[37/50] [abbrv] ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

2017-10-13 Thread rlevas 
AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)


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

Branch: refs/heads/branch-feature-AMBARI-20859
Commit: c3f6ba7621963b1086b7d9754d49b8663c7892b5
Parents: 3acfa5c
Author: Dmytro Sen 
Authored: Thu Oct 12 13:52:31 2017 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 12 13:52:31 2017 +0300

--
 ambari-server/src/main/assemblies/server.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c3f6ba76/ambari-server/src/main/assemblies/server.xml
--
diff --git a/ambari-server/src/main/assemblies/server.xml 
b/ambari-server/src/main/assemblies/server.xml
index 3079d1b..37283fa 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -392,6 +392,11 @@
   /var/lib/ambari-server/resources
 
 
+  755
+  src/main/resources/kerberos.json
+  /var/lib/ambari-server/resources
+
+
   644
   src/main/resources/slider_resources/README.txt
   /var/lib/ambari-server/resources/apps

[16/50] [abbrv] ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

2017-10-12 Thread lpuskas 
AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)


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

Branch: refs/heads/feature-branch-AMBARI-21307
Commit: c3f6ba7621963b1086b7d9754d49b8663c7892b5
Parents: 3acfa5c
Author: Dmytro Sen 
Authored: Thu Oct 12 13:52:31 2017 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 12 13:52:31 2017 +0300

--
 ambari-server/src/main/assemblies/server.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c3f6ba76/ambari-server/src/main/assemblies/server.xml
--
diff --git a/ambari-server/src/main/assemblies/server.xml 
b/ambari-server/src/main/assemblies/server.xml
index 3079d1b..37283fa 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -392,6 +392,11 @@
   /var/lib/ambari-server/resources
 
 
+  755
+  src/main/resources/kerberos.json
+  /var/lib/ambari-server/resources
+
+
   644
   src/main/resources/slider_resources/README.txt
   /var/lib/ambari-server/resources/apps

ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

2017-10-12 Thread dsen 
Repository: ambari
Updated Branches:
  refs/heads/trunk 3acfa5c12 -> c3f6ba762


AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)


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

Branch: refs/heads/trunk
Commit: c3f6ba7621963b1086b7d9754d49b8663c7892b5
Parents: 3acfa5c
Author: Dmytro Sen 
Authored: Thu Oct 12 13:52:31 2017 +0300
Committer: Dmytro Sen 
Committed: Thu Oct 12 13:52:31 2017 +0300

--
 ambari-server/src/main/assemblies/server.xml | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c3f6ba76/ambari-server/src/main/assemblies/server.xml
--
diff --git a/ambari-server/src/main/assemblies/server.xml 
b/ambari-server/src/main/assemblies/server.xml
index 3079d1b..37283fa 100644
--- a/ambari-server/src/main/assemblies/server.xml
+++ b/ambari-server/src/main/assemblies/server.xml
@@ -392,6 +392,11 @@
   /var/lib/ambari-server/resources
 
 
+  755
+  src/main/resources/kerberos.json
+  /var/lib/ambari-server/resources
+
+
   644
   src/main/resources/slider_resources/README.txt
   /var/lib/ambari-server/resources/apps

[09/50] [abbrv] ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

2017-10-11 Thread jaimin 
AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)


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

Branch: refs/heads/branch-feature-AMBARI-14714-ui
Commit: 2fb4649e2a9381b98c4867ac4a550f7c3ff7ed23
Parents: 01b79aa
Author: Dmytro Sen 
Authored: Fri Oct 6 19:39:24 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 6 19:39:24 2017 +0300

--
 .../server/api/services/AmbariMetaInfo.java | 54 +++--
 .../server/controller/StackVersionResponse.java | 29 ---
 .../internal/StackArtifactResourceProvider.java | 17 +
 .../ambari/server/stack/ServiceDirectory.java   |  3 +-
 .../ambari/server/stack/StackDirectory.java | 27 ---
 .../apache/ambari/server/stack/StackModule.java |  6 --
 .../apache/ambari/server/state/ServiceInfo.java |  2 +-
 .../apache/ambari/server/state/StackInfo.java   | 23 --
 ambari-server/src/main/resources/kerberos.json  | 79 
 .../resources/stacks/HDP/2.0.6/kerberos.json| 79 
 .../main/resources/stacks/HDP/3.0/kerberos.json | 79 
 .../server/api/services/AmbariMetaInfoTest.java | 19 +++--
 .../ambari/server/stack/StackManagerTest.java   |  8 --
 .../KerberosDescriptorUpdateHelperTest.java |  1 +
 ambari-server/src/test/resources/kerberos.json  | 42 +++
 .../resources/stacks/HDP/2.0.8/kerberos.json| 42 ---
 16 files changed, 170 insertions(+), 340 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2fb4649e/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 425d247..46ee65a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -21,7 +21,6 @@ package org.apache.ambari.server.api.services;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.Component;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.HostComponent;
 import static 
org.apache.ambari.server.controller.utilities.PropertyHelper.AGGREGATE_FUNCTION_IDENTIFIERS;
-import static 
org.apache.ambari.server.stack.StackDirectory.WIDGETS_DESCRIPTOR_FILE_NAME;
 
 import java.io.File;
 import java.io.FileReader;
@@ -106,6 +105,17 @@ public class AmbariMetaInfo {
* Version of XML files with support of custom services and custom commands
*/
   public static final String SCHEMA_VERSION_2 = "2.0";
+
+  /**
+   * The filename for a Kerberos descriptor file at either the stack or 
service level
+   */
+  public static final String KERBEROS_DESCRIPTOR_FILE_NAME = "kerberos.json";
+
+  /**
+   * The filename for a Widgets descriptor file at either the stack or service 
level
+   */
+  public static final String WIDGETS_DESCRIPTOR_FILE_NAME = "widgets.json";
+
   private final static Logger LOG = 
LoggerFactory.getLogger(AmbariMetaInfo.class);
 
 
@@ -128,6 +138,7 @@ public class AmbariMetaInfo {
   private File serverVersionFile;
   private File commonWidgetsDescriptorFile;
   private File customActionRoot;
+  private String commonKerberosDescriptorFileLocation;
   private Map versionDefinitions = null;
 
 
@@ -217,6 +228,7 @@ public class AmbariMetaInfo {
 
 customActionRoot = new File(conf.getCustomActionDefinitionPath());
 
+commonKerberosDescriptorFileLocation = new File(conf.getResourceDirPath(), 
KERBEROS_DESCRIPTOR_FILE_NAME).getAbsolutePath();
 commonWidgetsDescriptorFile = new File(conf.getResourceDirPath(), 
WIDGETS_DESCRIPTOR_FILE_NAME);
   }
 
@@ -1257,38 +1269,25 @@ public class AmbariMetaInfo {
   public KerberosDescriptor getKerberosDescriptor(String stackName, String 
stackVersion, boolean includePreconfigureData) throws AmbariException {
 StackInfo stackInfo = getStack(stackName, stackVersion);
 
-KerberosDescriptor kerberosDescriptor = null;
+KerberosDescriptor kerberosDescriptor = 
readKerberosDescriptorFromFile(getCommonKerberosDescriptorFileLocation());
 
+if (kerberosDescriptor == null) {
+  LOG.warn("Couldn't read common Kerberos descriptor with path {%s}", 
getCommonKerberosDescriptorFileLocation());
+  kerberosDescriptor = new KerberosDescriptor();
+}
 // Read in the stack-level Kerberos descriptor pre-configuration

[46/50] [abbrv] ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

2017-10-09 Thread jluniya 
AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 2fb4649e2a9381b98c4867ac4a550f7c3ff7ed23
Parents: 01b79aa
Author: Dmytro Sen 
Authored: Fri Oct 6 19:39:24 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 6 19:39:24 2017 +0300

--
 .../server/api/services/AmbariMetaInfo.java | 54 +++--
 .../server/controller/StackVersionResponse.java | 29 ---
 .../internal/StackArtifactResourceProvider.java | 17 +
 .../ambari/server/stack/ServiceDirectory.java   |  3 +-
 .../ambari/server/stack/StackDirectory.java | 27 ---
 .../apache/ambari/server/stack/StackModule.java |  6 --
 .../apache/ambari/server/state/ServiceInfo.java |  2 +-
 .../apache/ambari/server/state/StackInfo.java   | 23 --
 ambari-server/src/main/resources/kerberos.json  | 79 
 .../resources/stacks/HDP/2.0.6/kerberos.json| 79 
 .../main/resources/stacks/HDP/3.0/kerberos.json | 79 
 .../server/api/services/AmbariMetaInfoTest.java | 19 +++--
 .../ambari/server/stack/StackManagerTest.java   |  8 --
 .../KerberosDescriptorUpdateHelperTest.java |  1 +
 ambari-server/src/test/resources/kerberos.json  | 42 +++
 .../resources/stacks/HDP/2.0.8/kerberos.json| 42 ---
 16 files changed, 170 insertions(+), 340 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2fb4649e/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 425d247..46ee65a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -21,7 +21,6 @@ package org.apache.ambari.server.api.services;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.Component;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.HostComponent;
 import static 
org.apache.ambari.server.controller.utilities.PropertyHelper.AGGREGATE_FUNCTION_IDENTIFIERS;
-import static 
org.apache.ambari.server.stack.StackDirectory.WIDGETS_DESCRIPTOR_FILE_NAME;
 
 import java.io.File;
 import java.io.FileReader;
@@ -106,6 +105,17 @@ public class AmbariMetaInfo {
* Version of XML files with support of custom services and custom commands
*/
   public static final String SCHEMA_VERSION_2 = "2.0";
+
+  /**
+   * The filename for a Kerberos descriptor file at either the stack or 
service level
+   */
+  public static final String KERBEROS_DESCRIPTOR_FILE_NAME = "kerberos.json";
+
+  /**
+   * The filename for a Widgets descriptor file at either the stack or service 
level
+   */
+  public static final String WIDGETS_DESCRIPTOR_FILE_NAME = "widgets.json";
+
   private final static Logger LOG = 
LoggerFactory.getLogger(AmbariMetaInfo.class);
 
 
@@ -128,6 +138,7 @@ public class AmbariMetaInfo {
   private File serverVersionFile;
   private File commonWidgetsDescriptorFile;
   private File customActionRoot;
+  private String commonKerberosDescriptorFileLocation;
   private Map versionDefinitions = null;
 
 
@@ -217,6 +228,7 @@ public class AmbariMetaInfo {
 
 customActionRoot = new File(conf.getCustomActionDefinitionPath());
 
+commonKerberosDescriptorFileLocation = new File(conf.getResourceDirPath(), 
KERBEROS_DESCRIPTOR_FILE_NAME).getAbsolutePath();
 commonWidgetsDescriptorFile = new File(conf.getResourceDirPath(), 
WIDGETS_DESCRIPTOR_FILE_NAME);
   }
 
@@ -1257,38 +1269,25 @@ public class AmbariMetaInfo {
   public KerberosDescriptor getKerberosDescriptor(String stackName, String 
stackVersion, boolean includePreconfigureData) throws AmbariException {
 StackInfo stackInfo = getStack(stackName, stackVersion);
 
-KerberosDescriptor kerberosDescriptor = null;
+KerberosDescriptor kerberosDescriptor = 
readKerberosDescriptorFromFile(getCommonKerberosDescriptorFileLocation());
 
+if (kerberosDescriptor == null) {
+  LOG.warn("Couldn't read common Kerberos descriptor with path {%s}", 
getCommonKerberosDescriptorFileLocation());
+  kerberosDescriptor = new KerberosDescriptor();
+}
 // Read in the stack-level Kerberos descriptor pre-configuration data

ambari git commit: AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)

2017-10-06 Thread dsen 
Repository: ambari
Updated Branches:
  refs/heads/trunk 01b79aae5 -> 2fb4649e2


AMBARI-22147 Move stacks/HDP/3.0/kerberos.json to stacks/kerberos.json (dsen)


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

Branch: refs/heads/trunk
Commit: 2fb4649e2a9381b98c4867ac4a550f7c3ff7ed23
Parents: 01b79aa
Author: Dmytro Sen 
Authored: Fri Oct 6 19:39:24 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Oct 6 19:39:24 2017 +0300

--
 .../server/api/services/AmbariMetaInfo.java | 54 +++--
 .../server/controller/StackVersionResponse.java | 29 ---
 .../internal/StackArtifactResourceProvider.java | 17 +
 .../ambari/server/stack/ServiceDirectory.java   |  3 +-
 .../ambari/server/stack/StackDirectory.java | 27 ---
 .../apache/ambari/server/stack/StackModule.java |  6 --
 .../apache/ambari/server/state/ServiceInfo.java |  2 +-
 .../apache/ambari/server/state/StackInfo.java   | 23 --
 ambari-server/src/main/resources/kerberos.json  | 79 
 .../resources/stacks/HDP/2.0.6/kerberos.json| 79 
 .../main/resources/stacks/HDP/3.0/kerberos.json | 79 
 .../server/api/services/AmbariMetaInfoTest.java | 19 +++--
 .../ambari/server/stack/StackManagerTest.java   |  8 --
 .../KerberosDescriptorUpdateHelperTest.java |  1 +
 ambari-server/src/test/resources/kerberos.json  | 42 +++
 .../resources/stacks/HDP/2.0.8/kerberos.json| 42 ---
 16 files changed, 170 insertions(+), 340 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2fb4649e/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 425d247..46ee65a 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -21,7 +21,6 @@ package org.apache.ambari.server.api.services;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.Component;
 import static 
org.apache.ambari.server.controller.spi.Resource.InternalType.HostComponent;
 import static 
org.apache.ambari.server.controller.utilities.PropertyHelper.AGGREGATE_FUNCTION_IDENTIFIERS;
-import static 
org.apache.ambari.server.stack.StackDirectory.WIDGETS_DESCRIPTOR_FILE_NAME;
 
 import java.io.File;
 import java.io.FileReader;
@@ -106,6 +105,17 @@ public class AmbariMetaInfo {
* Version of XML files with support of custom services and custom commands
*/
   public static final String SCHEMA_VERSION_2 = "2.0";
+
+  /**
+   * The filename for a Kerberos descriptor file at either the stack or 
service level
+   */
+  public static final String KERBEROS_DESCRIPTOR_FILE_NAME = "kerberos.json";
+
+  /**
+   * The filename for a Widgets descriptor file at either the stack or service 
level
+   */
+  public static final String WIDGETS_DESCRIPTOR_FILE_NAME = "widgets.json";
+
   private final static Logger LOG = 
LoggerFactory.getLogger(AmbariMetaInfo.class);
 
 
@@ -128,6 +138,7 @@ public class AmbariMetaInfo {
   private File serverVersionFile;
   private File commonWidgetsDescriptorFile;
   private File customActionRoot;
+  private String commonKerberosDescriptorFileLocation;
   private Map versionDefinitions = null;
 
 
@@ -217,6 +228,7 @@ public class AmbariMetaInfo {
 
 customActionRoot = new File(conf.getCustomActionDefinitionPath());
 
+commonKerberosDescriptorFileLocation = new File(conf.getResourceDirPath(), 
KERBEROS_DESCRIPTOR_FILE_NAME).getAbsolutePath();
 commonWidgetsDescriptorFile = new File(conf.getResourceDirPath(), 
WIDGETS_DESCRIPTOR_FILE_NAME);
   }
 
@@ -1257,38 +1269,25 @@ public class AmbariMetaInfo {
   public KerberosDescriptor getKerberosDescriptor(String stackName, String 
stackVersion, boolean includePreconfigureData) throws AmbariException {
 StackInfo stackInfo = getStack(stackName, stackVersion);
 
-KerberosDescriptor kerberosDescriptor = null;
+KerberosDescriptor kerberosDescriptor = 
readKerberosDescriptorFromFile(getCommonKerberosDescriptorFileLocation());
 
+if (kerberosDescriptor == null) {
+  LOG.warn("Couldn't read common Kerberos descriptor with path {%s}", 
getCommonKerberosDescriptorFileLocation());
+  kerberosDescriptor = new KerberosDescriptor();
+}
 // Read in