Repository: ambari Updated Branches: refs/heads/trunk 7cb58ff2b -> 8b0cdcaac
AMBARI-17506. Atlas empty required config is present after Upgrade from 2.2.0.0 to 2.4.0.0.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8b0cdcaa Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8b0cdcaa Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8b0cdcaa Branch: refs/heads/trunk Commit: 8b0cdcaacd197e6e4700ce0a5ed31c5e90f6c348 Parents: 7cb58ff Author: Vitaly Brodetskyi <[email protected]> Authored: Thu Jun 30 21:53:30 2016 +0300 Committer: Vitaly Brodetskyi <[email protected]> Committed: Thu Jun 30 21:53:30 2016 +0300 ---------------------------------------------------------------------- .../configuration/application-properties.xml | 40 ++++++++++---------- .../configuration/application-properties.xml | 2 +- 2 files changed, 21 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8b0cdcaa/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml index 1437251..8e349f0 100644 --- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml +++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/configuration/application-properties.xml @@ -251,7 +251,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <!-- LDAP properties. They all begin with "atlas.authentication.method.ldap." @@ -261,43 +261,43 @@ <name>atlas.authentication.method.ldap.url</name> <value> </value> <description>The LDAP URL.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.userDNpattern</name> <value>uid=</value> <description>User DN Pattern. This pattern is used to create a distinguished name (DN) for a user during login</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.groupSearchBase</name> <value> </value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.groupSearchFilter</name> <value> </value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.groupRoleAttribute</name> <value>cn</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.base.dn</name> <value> </value> <description>The Distinguished Name (DN) of the starting point for directory server searches.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.bind.dn</name> <value> </value> <description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.bind.password</name> @@ -308,25 +308,25 @@ <type>password</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.referral</name> <value>ignore</value> <description>Set to follow if multiple LDAP servers are configured to return continuation references for results. Set to ignore (default) if no referrals should be followed. Possible values are follow|throw|ignore</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.user.searchfilter</name> <value> </value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.default.role</name> <value>ROLE_USER</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> @@ -338,25 +338,25 @@ <display-name>Domain Name (Only for AD)</display-name> <value> </value> <description>AD domain, only used if Authentication method is AD</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.ad.url</name> <value> </value> <description>AD URL, only used if Authentication method is AD</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.ad.base.dn</name> <value> </value> <description>The Distinguished Name (DN) of the starting point for directory server searches.</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.ad.bind.dn</name> <value> </value> <description>Full distinguished name (DN), including common name (CN), of an LDAP user account that has privileges to search. </description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.ad.bind.password</name> @@ -367,24 +367,24 @@ <type>password</type> <overridable>false</overridable> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.ad.referral</name> <value>ignore</value> <description>Set to follow if multiple AD servers are configured to return continuation references for results. Set to ignore (default) if no referrals should be followed. Possible values are follow|throw|ignore</description> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.ad.user.searchfilter</name> <value>(sAMAccountName={0})</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.authentication.method.ldap.ad.default.role</name> <value>ROLE_USER</value> <description/> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> </configuration> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/8b0cdcaa/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml index 5f3d603..517a418 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/ATLAS/configuration/application-properties.xml @@ -131,7 +131,7 @@ </entries> <selection-cardinality>1</selection-cardinality> </value-attributes> - <on-ambari-upgrade add="true"/> + <on-ambari-upgrade add="false"/> </property> <property> <name>atlas.auth.policy.file</name>
