Revert "AMBARI-22583. Ambari should not force accounts created in IPA to be added a user named 'ambari-managed-principals' (rlevas)"
This reverts commit e973986e2292323e18282ce2fc6e75fdcdcb718f. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9b1fde34 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9b1fde34 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9b1fde34 Branch: refs/heads/branch-3.0-perf Commit: 9b1fde342378c91859bc60bb442b6f5ae682bec4 Parents: 76c4fa1 Author: Robert Levas <rle...@hortonworks.com> Authored: Wed Dec 6 12:46:30 2017 -0500 Committer: Robert Levas <rle...@hortonworks.com> Committed: Wed Dec 6 12:46:30 2017 -0500 ---------------------------------------------------------------------- .../KERBEROS/1.10.3-10/configuration/kerberos-env.xml | 3 ++- .../KERBEROS/1.10.3-30/configuration/kerberos-env.xml | 3 ++- .../PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9b1fde34/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml index b144b32..293bcf8 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml @@ -354,11 +354,12 @@ <description> The group in IPA user principals should be member of </description> - <value/> + <value>ambari-managed-principals</value> <value-attributes> <empty-value-valid>true</empty-value-valid> <visible>false</visible> </value-attributes> + <on-ambari-upgrade add="true"/> </property> <property> <name>preconfigure_services</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/9b1fde34/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml index b144b32..293bcf8 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-30/configuration/kerberos-env.xml @@ -354,11 +354,12 @@ <description> The group in IPA user principals should be member of </description> - <value/> + <value>ambari-managed-principals</value> <value-attributes> <empty-value-valid>true</empty-value-valid> <visible>false</visible> </value-attributes> + <on-ambari-upgrade add="true"/> </property> <property> <name>preconfigure_services</name> http://git-wip-us.apache.org/repos/asf/ambari/blob/9b1fde34/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml index 802b96f..a66a7a6 100644 --- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml +++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml @@ -353,10 +353,11 @@ <description> The group in IPA user principals should be member of </description> - <value/> + <value>ambari-managed-principals</value> <value-attributes> <empty-value-valid>true</empty-value-valid> <visible>false</visible> </value-attributes> + <on-ambari-upgrade add="true"/> </property> </configuration>
