> On March 27, 2017, 3:18 p.m., Sebastian Toader wrote: > > ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml > > Lines 60-63 (original), 60-63 (patched) > > <https://reviews.apache.org/r/57959/diff/1/?file=1676915#file1676915line60> > > > > This looks to be a duplication of the j2 file. Keep only just the j2 > > file and reference it from here. > > Balázs Bence Sári wrote: > I tested this out: > - In order to the reference the .j2 file from the xml, I need to move it > from the *package/templates* folder to the *properties* folder. > - There is a direct reference to the template from *kerberos-common.py*. > If I move the script to the *properties* folder, that reference will be > broken. Changing the path in Template constructor to > *Template('../../properties/krb5_conf.j2')* will not fix it as the file will > not be pushed to the agent. > > There are two ways I can deal with this duplication: > 1. Keep the .j2 file in both *properties* and *package/templates* (still > duplication, but better than pasting it to the xml) > 2. Move the .j2 file to *properties* and only use *InlineTemplate* in > *kerberos-common.py* (remove the if-else construct around line 119). I tested > blueprint istallation and *InlineTemplate* is used i that case too, don't > know when the else case is triggered.
... I mean "don't know when the **if** case is triggered" - Balázs Bence ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/57959/#review170180 ----------------------------------------------------------- On March 27, 2017, 2:54 p.m., Balázs Bence Sári wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://reviews.apache.org/r/57959/ > ----------------------------------------------------------- > > (Updated March 27, 2017, 2:54 p.m.) > > > Review request for Ambari, Attila Magyar, Laszlo Puskas, Robert Levas, Sandor > Magyari, and Sebastian Toader. > > > Bugs: AMBARI-20586 > https://issues.apache.org/jira/browse/AMBARI-20586 > > > Repository: ambari > > > Description > ------- > > Added master_kdc to kerberos env and the krb5 config template. > > > Diffs > ----- > > > ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java > 25f2001 > > ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml > 965ee13 > > ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/krb5-conf.xml > c692b92 > > ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/params.py > 57f062a > > ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/templates/krb5_conf.j2 > 0191953 > > ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/kerberos-env.xml > 7016437 > > ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/configuration/krb5-conf.xml > c692b92 > > ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/templates/krb5_conf.j2 > 0191953 > > ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java > fa2082b > ambari-server/src/test/python/stacks/2.2/KERBEROS/test_kerberos_client.py > 6727b2f > ambari-server/src/test/python/stacks/2.2/KERBEROS/use_cases.py 17d9f88 > > > Diff: https://reviews.apache.org/r/57959/diff/2/ > > > Testing > ------- > > - Tested manually > - Updated Java unit tests > - All ambari-server unit tests pass. > > > Thanks, > > Balázs Bence Sári > >
