You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/06/24 13:50:43 UTC

[1/2] ambari git commit: AMBARI-17427. Support Atlas in kerberized environment, submit Service Check as smokeuser (dlysnichenko)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 87f7fec4c -> 834911835
  refs/heads/trunk c98597fd1 -> d4b4cc90a


AMBARI-17427. Support Atlas in kerberized environment, submit Service Check as smokeuser (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/83491183
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/83491183
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/83491183

Branch: refs/heads/branch-2.4
Commit: 83491183549ae6b6fec6e3fb802390e14da52532
Parents: 87f7fec
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Jun 24 16:49:33 2016 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Jun 24 16:49:33 2016 +0300

----------------------------------------------------------------------
 .../ATLAS/0.1.0.2.3/package/scripts/service_check.py               | 2 +-
 .../src/test/python/stacks/2.3/ATLAS/test_service_check.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/83491183/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
index 194a3fb..6b03d50 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
@@ -30,7 +30,7 @@ class AtlasServiceCheck(Script):
 
     if params.security_enabled:
       Execute(format("{kinit_path_local} -kt {smokeuser_keytab} {smokeuser_principal}"),
-              user=params.metadata_user)
+              user=params.smoke_test_user)
 
     try:
       Execute(params.smoke_cmd, user=params.metadata_user, tries = 5,

http://git-wip-us.apache.org/repos/asf/ambari/blob/83491183/ambari-server/src/test/python/stacks/2.3/ATLAS/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_service_check.py b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_service_check.py
index 49395a7..a8b54cb 100644
--- a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_service_check.py
@@ -52,7 +52,7 @@ class TestAtlasCheck(RMFTestCase):
 
     self.assertResourceCalled('Execute',
                               '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa@EXAMPLE.COM',
-                              user = 'atlas')
+                              user = 'ambari-qa')
 
     self.assertResourceCalled('Execute', 'curl --negotiate -u : -b ~/cookiejar.txt -c ~/cookiejar.txt -s -o /dev/null -w "%{http_code}" https://c6401.ambari.apache.org:21443/',
                               user = 'atlas',


[2/2] ambari git commit: AMBARI-17427. Support Atlas in kerberized environment, submit Service Check as smokeuser (dlysnichenko)

Posted by dm...@apache.org.
AMBARI-17427. Support Atlas in kerberized environment, submit Service Check as smokeuser (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d4b4cc90
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d4b4cc90
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d4b4cc90

Branch: refs/heads/trunk
Commit: d4b4cc90a51cc7e085f30bf3a89c964a3421c7f9
Parents: c98597f
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Fri Jun 24 16:49:33 2016 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Fri Jun 24 16:50:15 2016 +0300

----------------------------------------------------------------------
 .../ATLAS/0.1.0.2.3/package/scripts/service_check.py               | 2 +-
 .../src/test/python/stacks/2.3/ATLAS/test_service_check.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/d4b4cc90/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
index 8978396..7887583 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/service_check.py
@@ -33,7 +33,7 @@ class AtlasServiceCheck(Script):
 
     if params.security_enabled:
       Execute(format("{kinit_path_local} -kt {smokeuser_keytab} {smokeuser_principal}"),
-              user=params.metadata_user)
+              user=params.smoke_test_user)
 
     try:
       Execute(params.smoke_cmd, user=params.metadata_user, tries = 5,

http://git-wip-us.apache.org/repos/asf/ambari/blob/d4b4cc90/ambari-server/src/test/python/stacks/2.3/ATLAS/test_service_check.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_service_check.py b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_service_check.py
index 49395a7..a8b54cb 100644
--- a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_service_check.py
@@ -52,7 +52,7 @@ class TestAtlasCheck(RMFTestCase):
 
     self.assertResourceCalled('Execute',
                               '/usr/bin/kinit -kt /etc/security/keytabs/smokeuser.headless.keytab ambari-qa@EXAMPLE.COM',
-                              user = 'atlas')
+                              user = 'ambari-qa')
 
     self.assertResourceCalled('Execute', 'curl --negotiate -u : -b ~/cookiejar.txt -c ~/cookiejar.txt -s -o /dev/null -w "%{http_code}" https://c6401.ambari.apache.org:21443/',
                               user = 'atlas',