You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/11/05 02:08:22 UTC
git commit: AMBARI-8145. Knox install should generate a good self
signed certificate. (sumit gupta via jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 646ba61da -> 2b36334f2
AMBARI-8145. Knox install should generate a good self signed certificate. (sumit gupta via jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b36334f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b36334f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b36334f
Branch: refs/heads/trunk
Commit: 2b36334f2d799a65f3dc3ed322651dc51dce06e4
Parents: 646ba61
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Nov 4 17:07:30 2014 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Nov 4 17:07:40 2014 -0800
----------------------------------------------------------------------
.../stacks/HDP/2.2/services/KNOX/package/scripts/knox.py | 7 +++++++
.../stacks/HDP/2.2/services/KNOX/package/scripts/params.py | 2 ++
.../src/test/python/stacks/2.2/KNOX/test_knox_gateway.py | 5 +++++
3 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b36334f/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
index 9176480..2061db1 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/knox.py
@@ -62,3 +62,10 @@ def knox():
environment={'JAVA_HOME': params.java_home},
not_if=format('test -f {knox_master_secret_path}')
)
+
+ cmd = format('{knox_client_bin} create-cert --hostname {knox_host_name_in_cluster}')
+ Execute(cmd,
+ user=params.knox_user,
+ environment={'JAVA_HOME': params.java_home},
+ not_if=format('test -f {knox_cert_store_path}')
+ )
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b36334f/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
index 7e135f5..e11f287 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/KNOX/package/scripts/params.py
@@ -116,7 +116,9 @@ knox_pid_file = status_params.knox_pid_file
ldap_pid_file = status_params.ldap_pid_file
knox_master_secret = config['configurations']['knox-env']['knox_master_secret']
knox_master_secret_path = '/var/lib/knox/data/security/master'
+knox_cert_store_path = '/var/lib/knox/data/security/keystores/gateway.jks'
knox_host_name = config['clusterHostInfo']['knox_gateway_hosts'][0]
+knox_host_name_in_cluster = config['hostname']
knox_host_port = config['configurations']['gateway-site']['gateway.port']
topology_template = config['configurations']['topology']['content']
gateway_log4j = config['configurations']['gateway-log4j']['content']
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b36334f/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
index da6d5b1..2c06f83 100644
--- a/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
+++ b/ambari-server/src/test/python/stacks/2.2/KNOX/test_knox_gateway.py
@@ -58,6 +58,11 @@ class TestKnoxGateway(RMFTestCase):
environment={'JAVA_HOME': '/usr/jdk64/jdk1.7.0_45'},
not_if='test -f /var/lib/knox/data/security/master'
)
+ self.assertResourceCalled('Execute', '/usr/lib/knox/bin/knoxcli.sh create-cert --hostname c6401.ambari.apache.org',
+ user='knox',
+ environment={'JAVA_HOME': '/usr/jdk64/jdk1.7.0_45'},
+ not_if='test -f /var/lib/knox/data/security/keystores/gateway.jks'
+ )
self.assertResourceCalled('File', '/etc/knox/conf/ldap-log4j.properties',
mode=0644,
group='knox',