date:20171119

ambari git commit: AMBARI-22462 Remove hard-code from StackAdvisorCommand requests to another resources (dgrinenko)

2017-11-19 Thread hapylestat

Repository: ambari
Updated Branches:
  refs/heads/trunk 8b820346c -> 786d4b633


AMBARI-22462 Remove hard-code from StackAdvisorCommand requests to another 
resources (dgrinenko)


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

Branch: refs/heads/trunk
Commit: 786d4b63349d2c0f18d8a06a29fe1cc5598cf8fc
Parents: 8b82034
Author: Dmytro Grinenko 
Authored: Mon Nov 20 07:37:02 2017 +0200
Committer: Dmytro Grinenko 
Committed: Mon Nov 20 07:37:02 2017 +0200

--
 .../stackadvisor/commands/StackAdvisorCommand.java   | 15 +++
 .../ambari/server/controller/KerberosHelperImpl.java |  6 +++---
 ...erviceComponentConfigurationResourceProvider.java |  8 
 .../AbstractPrepareKerberosServerAction.java |  6 --
 .../PrepareKerberosIdentitiesServerAction.java   |  5 -
 .../apache/ambari/server/topology/AmbariContext.java |  3 ++-
 .../ambari/server/topology/BlueprintFactory.java |  3 ++-
 .../validators/RequiredPasswordValidator.java|  3 ++-
 8 files changed, 32 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/786d4b63/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
index 17591ec..1b89c4f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java
@@ -47,6 +47,7 @@ import 
org.apache.ambari.server.api.services.stackadvisor.StackAdvisorResponse;
 import org.apache.ambari.server.api.services.stackadvisor.StackAdvisorRunner;
 import org.apache.ambari.server.controller.RootComponent;
 import org.apache.ambari.server.controller.RootService;
+import 
org.apache.ambari.server.controller.internal.RootServiceComponentConfigurationResourceProvider;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.utils.DateUtils;
@@ -77,6 +78,8 @@ public abstract class StackAdvisorCommand extend
 
   private static final String GET_HOSTS_INFO_URI = "/api/v1/hosts"
   + "?fields=Hosts/*/host_name.in(%s)";
+  static final String LDAP_CONFIGURATION_PROPERTY = "ldap-configuration";
+
   private static final String GET_SERVICES_INFO_URI = 
"/api/v1/stacks/%s/versions/%s/"
   + 
"?fields=Versions/stack_name,Versions/stack_version,Versions/parent_stack_version"
   + 
",services/StackServices/service_name,services/StackServices/service_version"
@@ -86,9 +89,14 @@ public abstract class StackAdvisorCommand extend
   + 
",services/configurations/dependencies/StackConfigurationDependency/dependency_name"
   + 
",services/configurations/dependencies/StackConfigurationDependency/dependency_type,services/configurations/StackConfigurations/type"
   + "/StackServices/service_name.in(%s)";
-  private static final String GET_AMBARI_LDAP_CONFIG_URI = 
"/api/v1/services/AMBARI/components/AMBARI_SERVER/configurations" +
-  "?Configuration/category=ldap-configuration" +
-  "=Configuration/properties";
+
+  private static final String GET_AMBARI_LDAP_CONFIG_URI = 
String.format("/api/v1/services/%s/components/%s/configurations?%s=%s=%s",
+RootService.AMBARI.name(),
+RootComponent.AMBARI_SERVER.name(),
+
RootServiceComponentConfigurationResourceProvider.CONFIGURATION_CATEGORY_PROPERTY_ID,
+LDAP_CONFIGURATION_PROPERTY,
+
RootServiceComponentConfigurationResourceProvider.CONFIGURATION_PROPERTIES_PROPERTY_ID);
+
   private static final String SERVICES_PROPERTY = "services";
   private static final String SERVICES_COMPONENTS_PROPERTY = "components";
   private static final String CONFIG_GROUPS_PROPERTY = "config-groups";
@@ -100,7 +108,6 @@ public abstract class StackAdvisorCommand extend
   private static final String CHANGED_CONFIGURATIONS_PROPERTY = 
"changed-configurations";
   private static final String USER_CONTEXT_PROPERTY = "user-context";
   private static final String AMBARI_SERVER_CONFIGURATIONS_PROPERTY = 
"ambari-server-properties";
-  static final String LDAP_CONFIGURATION_PROPERTY = "ldap-configuration";
 
   private File recommendationsDir;
   private String

ambari git commit: AMBARI-22463 Removing secure reference configs entries from stack for Ranger KMS service (mugdha)

2017-11-19 Thread mugdha

Repository: ambari
Updated Branches:
  refs/heads/trunk 2d9fd418a -> 8b820346c


AMBARI-22463 Removing secure reference configs entries from stack for Ranger 
KMS service (mugdha)


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

Branch: refs/heads/trunk
Commit: 8b820346ca2902016ee2d5d7d5d3ff5d60126933
Parents: 2d9fd41
Author: Mugdha Varadkar 
Authored: Mon Nov 20 10:27:46 2017 +0530
Committer: Mugdha Varadkar 
Committed: Mon Nov 20 10:57:23 2017 +0530

--
 .../0.5.0.2.3/configuration/kms-site.xml| 26 
 .../1.0.0.3.0/configuration/kms-site.xml| 26 
 2 files changed, 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8b820346/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml
index 59a6952..5dcdd82 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/configuration/kms-site.xml
@@ -65,19 +65,6 @@
 
   
   
-hadoop.kms.authentication.kerberos.keytab
-${user.home}/kms.keytab
-Path to the keytab with credentials for the configured 
Kerberos principal.
-
-  
-  
-hadoop.kms.authentication.kerberos.principal
-HTTP/localhost
-The Kerberos principal to use for the HTTP endpoint. The 
principal must start with 'HTTP/' as per the Kerberos HTTP SPNEGO 
specification.
-KERBEROS_PRINCIPAL
-
-  
-  
 hadoop.kms.authentication.kerberos.name.rules
 DEFAULT
 Rules used to resolve Kerberos principal names.
@@ -112,19 +99,6 @@
 
   
   
-
hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.keytab
-/etc/hadoop/conf/kms.keytab
-The absolute path for the Kerberos keytab with the 
credentials to connect to Zookeeper.
-
-  
-  
-
hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.principal
-kms/#HOSTNAME#
-The Kerberos service principal used to connect to 
Zookeeper.
-KERBEROS_PRINCIPAL
-
-  
-  
 hadoop.kms.security.authorization.manager
 
org.apache.ranger.authorization.kms.authorizer.RangerKmsAuthorizer
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/8b820346/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/configuration/kms-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/configuration/kms-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/configuration/kms-site.xml
index 1e6f7b5..19ce76f 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/configuration/kms-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER_KMS/1.0.0.3.0/configuration/kms-site.xml
@@ -65,19 +65,6 @@
 
   
   
-hadoop.kms.authentication.kerberos.keytab
-${user.home}/kms.keytab
-Path to the keytab with credentials for the configured 
Kerberos principal.
-
-  
-  
-hadoop.kms.authentication.kerberos.principal
-HTTP/localhost
-The Kerberos principal to use for the HTTP endpoint. The 
principal must start with 'HTTP/' as per the Kerberos HTTP SPNEGO 
specification.
-KERBEROS_PRINCIPAL
-
-  
-  
 hadoop.kms.authentication.kerberos.name.rules
 DEFAULT
 Rules used to resolve Kerberos principal names.
@@ -112,19 +99,6 @@
 
   
   
-
hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.keytab
-/etc/hadoop/conf/kms.keytab
-The absolute path for the Kerberos keytab with the 
credentials to connect to Zookeeper.
-
-  
-  
-
hadoop.kms.authentication.signer.secret.provider.zookeeper.kerberos.principal
-kms/#HOSTNAME#
-The Kerberos service principal used to connect to 
Zookeeper.
-KERBEROS_PRINCIPAL
-
-  
-  
 hadoop.kms.security.authorization.manager
 
org.apache.ranger.authorization.kms.authorizer.RangerKmsAuthorizer

ambari git commit: AMBARI-22462 Remove hard-code from StackAdvisorCommand requests to another resources (dgrinenko)

ambari git commit: AMBARI-22463 Removing secure reference configs entries from stack for Ranger KMS service (mugdha)

2 matches

Site Navigation

Mail list logo

Footer information