git commit: Removes Oozie password override from HDP 2.1 stack
Repository: ambari Updated Branches: refs/heads/trunk bd635ecea - 353daeb94 Removes Oozie password override from HDP 2.1 stack When an Ambari Blueprint is exported from a running cluster based on the HDP 2.1 stack, and including Oozie, an Oozie password will be included in the exported Blueprint. This is incorrect behavior, since no password data should be available in the exported Blueprint. The Blueprint processing code relies on the HDP stack definitions in order to determine which fields are passwords. This patch addresses this problem by removing the Oozie password field form the HDP 2.1 stack definition. The HDP 2.0.6 stack (which is a parent of the 2.1 stack) already includes the correct metadata for this password field, such that the Blueprint processor will keep this field out of an exported Blueprint as expected. Since there is no need to override this property in the 2.1 stack, the correct metadata can be inherited from the 2.0.6 stack. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/353daeb9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/353daeb9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/353daeb9 Branch: refs/heads/trunk Commit: 353daeb940f47ef92ad01daa9086104539809795 Parents: bd635ec Author: Bob Nettleton rnettle...@hortonworks.com Authored: Mon Sep 22 16:55:26 2014 -0400 Committer: John Speidel jspei...@hortonworks.com Committed: Fri Sep 26 11:08:16 2014 -0400 -- .../HDP/2.1/services/OOZIE/configuration/oozie-site.xml | 11 --- 1 file changed, 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/353daeb9/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml index a7efb9c..3b6fd0b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml @@ -222,17 +222,6 @@ /property property -nameoozie.service.JPAService.jdbc.password/name -value /value -description - DB user password. - - IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value, - if empty Configuration assumes it is NULL. -/description - /property - - property nameoozie.service.JPAService.pool.max.active.conn/name value10/value description
[40/44] git commit: Removes Oozie password override from HDP 2.1 stack
Removes Oozie password override from HDP 2.1 stack When an Ambari Blueprint is exported from a running cluster based on the HDP 2.1 stack, and including Oozie, an Oozie password will be included in the exported Blueprint. This is incorrect behavior, since no password data should be available in the exported Blueprint. The Blueprint processing code relies on the HDP stack definitions in order to determine which fields are passwords. This patch addresses this problem by removing the Oozie password field form the HDP 2.1 stack definition. The HDP 2.0.6 stack (which is a parent of the 2.1 stack) already includes the correct metadata for this password field, such that the Blueprint processor will keep this field out of an exported Blueprint as expected. Since there is no need to override this property in the 2.1 stack, the correct metadata can be inherited from the 2.0.6 stack. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/353daeb9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/353daeb9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/353daeb9 Branch: refs/heads/branch-alerts-dev Commit: 353daeb940f47ef92ad01daa9086104539809795 Parents: bd635ec Author: Bob Nettleton rnettle...@hortonworks.com Authored: Mon Sep 22 16:55:26 2014 -0400 Committer: John Speidel jspei...@hortonworks.com Committed: Fri Sep 26 11:08:16 2014 -0400 -- .../HDP/2.1/services/OOZIE/configuration/oozie-site.xml | 11 --- 1 file changed, 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/353daeb9/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml index a7efb9c..3b6fd0b 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/OOZIE/configuration/oozie-site.xml @@ -222,17 +222,6 @@ /property property -nameoozie.service.JPAService.jdbc.password/name -value /value -description - DB user password. - - IMPORTANT: if password is emtpy leave a 1 space string, the service trims the value, - if empty Configuration assumes it is NULL. -/description - /property - - property nameoozie.service.JPAService.pool.max.active.conn/name value10/value description
