Repository: ambari Updated Branches: refs/heads/trunk 8f253dfd3 -> 12d608141
AMBARI-10483. Provide option to not install Kerberos Client packages (rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12d60814 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12d60814 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12d60814 Branch: refs/heads/trunk Commit: 12d608141f6ea4f58c83c310b1f647e591455001 Parents: 8f253df Author: Robert Levas <[email protected]> Authored: Fri Apr 17 15:25:43 2015 -0400 Committer: Robert Levas <[email protected]> Committed: Fri Apr 17 15:25:48 2015 -0400 ---------------------------------------------------------------------- .../KERBEROS/1.10.3-10/configuration/kerberos-env.xml | 10 ++++++++++ .../KERBEROS/1.10.3-10/package/scripts/kerberos_client.py | 7 ++++++- ambari-web/app/data/HDP2/site_properties.js | 9 +++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/12d60814/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 6d2bc56..682d675 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 @@ -38,6 +38,16 @@ <value>true</value> </property> + <property> + <name>install_packages</name> + <description> + Indicates whether Ambari should install the Kerberos client package(s) or not. If not, it is + expected that Kerberos utility programs (such as kadmin, kinit, klist, and kdestroy) are + compatible with MIT Kerberos 5 version 1.10.3 in command line options and behaviors. + </description> + <value>true</value> + </property> + <property require-input="true"> <name>ldap_url</name> <description> http://git-wip-us.apache.org/repos/asf/ambari/blob/12d60814/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/kerberos_client.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/kerberos_client.py b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/kerberos_client.py index a05d64c..282915a 100644 --- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/kerberos_client.py +++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/package/scripts/kerberos_client.py @@ -22,7 +22,12 @@ from resource_management.libraries.functions.security_commons import cached_kini class KerberosClient(KerberosScript): def install(self, env): - self.install_packages(env, ['krb5-server', 'krb5-libs', 'krb5-auth-dialog', 'krb5', 'krb5-kdc', 'krb5-admin-server']) + install_packages = default('/configurations/kerberos-env/install_packages', "true") + if install_packages: + self.install_packages(env, ['krb5-server', 'krb5-libs', 'krb5-auth-dialog', 'krb5', 'krb5-kdc', 'krb5-admin-server']) + else: + print "Kerberos client packages are not being installed, manual installation is required." + self.configure(env) http://git-wip-us.apache.org/repos/asf/ambari/blob/12d60814/ambari-web/app/data/HDP2/site_properties.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js index 1eb73df..b5cfa77 100644 --- a/ambari-web/app/data/HDP2/site_properties.js +++ b/ambari-web/app/data/HDP2/site_properties.js @@ -1970,6 +1970,15 @@ var hdp2properties = [ }, { "id": "puppet var", + "name": "install_packages", + "displayName": "Install OS-specific Kerberos client package(s)", + "displayType": "checkbox", + "serviceName": "KERBEROS", + "filename": "kerberos-env.xml", + "category": "Advanced kerberos-env" + }, + { + "id": "puppet var", "name": "create_attributes_template", "displayName": "Attribute template", "serviceName": "KERBEROS",
