ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject ambari git commit: AMBARI-19176 Perf: enable security fails (dsen)
Date Tue, 13 Dec 2016 12:44:17 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 03518b055 -> ceec30a9f


AMBARI-19176 Perf: enable security fails (dsen)


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

Branch: refs/heads/branch-2.5
Commit: ceec30a9f4530d6f0a079000aa3bb7f7d216be1c
Parents: 03518b0
Author: Dmytro Sen <dsen@apache.org>
Authored: Tue Dec 13 14:30:54 2016 +0200
Committer: Dmytro Sen <dsen@apache.org>
Committed: Tue Dec 13 14:44:11 2016 +0200

----------------------------------------------------------------------
 .../PERF/1.0/services/KERBEROS/metainfo.xml     | 37 --------------------
 .../KERBEROS/package/scripts/kerberos_client.py |  4 +--
 .../KERBEROS/package/scripts/kerberos_common.py | 33 -----------------
 contrib/utils/perf/deploy-gce-perf-cluster.py   |  2 +-
 4 files changed, 2 insertions(+), 74 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ceec30a9/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/metainfo.xml
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/metainfo.xml
index 3ec6340..0e42bda 100644
--- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/metainfo.xml
+++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/metainfo.xml
@@ -70,43 +70,6 @@
                     </configFiles>
                 </component>
             </components>
-
-            <osSpecifics>
-                <osSpecific>
-                    <osFamily>redhat7,amazon2015,redhat6</osFamily>
-                    <packages>
-                        <package>
-                            <name>krb5-workstation</name>
-                            <skipUpgrade>true</skipUpgrade>
-                        </package>
-                    </packages>
-                </osSpecific>
-
-                <osSpecific>
-                    <osFamily>debian7,ubuntu12,ubuntu14,ubuntu16</osFamily>
-                    <packages>
-                        <package>
-                            <name>krb5-user</name>
-                            <skipUpgrade>true</skipUpgrade>
-                        </package>
-                        <package>
-                            <name>krb5-config</name>
-                            <skipUpgrade>true</skipUpgrade>
-                        </package>
-                    </packages>
-                </osSpecific>
-
-                <osSpecific>
-                    <osFamily>suse11,suse12</osFamily>
-                    <packages>
-                        <package>
-                            <name>krb5-client</name>
-                            <skipUpgrade>true</skipUpgrade>
-                        </package>
-                    </packages>
-                </osSpecific>
-            </osSpecifics>
-
             <commandScript>
                 <script>scripts/service_check.py</script>
                 <scriptType>PYTHON</scriptType>

http://git-wip-us.apache.org/repos/asf/ambari/blob/ceec30a9/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/scripts/kerberos_client.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/scripts/kerberos_client.py
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/scripts/kerberos_client.py
index ddc8063..2ab700d 100644
--- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/scripts/kerberos_client.py
+++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/scripts/kerberos_client.py
@@ -40,8 +40,6 @@ class KerberosClient(KerberosScript):
     #delete krb cache to prevent using old krb tickets on fresh kerberos setup
     self.clear_tmp_cache()
 
-    self.setup_jce()
-
   def status(self, env):
     raise ClientComponentHasNoStatus()
 
@@ -73,7 +71,7 @@ class KerberosClient(KerberosScript):
     self.delete_keytab_file()
 
   def download_install_jce(self, env):
-    self.setup_jce()
+    pass
 
 
 if __name__ == "__main__":

http://git-wip-us.apache.org/repos/asf/ambari/blob/ceec30a9/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/scripts/kerberos_common.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/scripts/kerberos_common.py
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/scripts/kerberos_common.py
index 3c6c83e..70c81e7 100644
--- a/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/scripts/kerberos_common.py
+++ b/ambari-server/src/main/resources/stacks/PERF/1.0/services/KERBEROS/package/scripts/kerberos_common.py
@@ -433,36 +433,3 @@ class KerberosScript(Script):
             curr_content['keytabs'][principal.replace("_HOST", params.hostname)] = '_REMOVED_'
 
             self.put_structured_out(curr_content)
-
-  def setup_jce(self):
-    import params
-
-    if not params.jdk_name:
-      return
-    jce_curl_target = None
-    if params.jce_policy_zip is not None:
-      jce_curl_target = format("{artifact_dir}/{jce_policy_zip}")
-      Directory(params.artifact_dir,
-                create_parents = True,
-                )
-      File(jce_curl_target,
-           content = DownloadSource(format("{jce_location}/{jce_policy_zip}")),
-           )
-    elif params.security_enabled:
-      # Something weird is happening
-      raise Fail("Security is enabled, but JCE policy zip is not specified.")
-
-    # The extraction will occur only after the security flag is set
-    if params.security_enabled:
-      security_dir = format("{java_home}/jre/lib/security")
-
-      File([format("{security_dir}/US_export_policy.jar"), format("{security_dir}/local_policy.jar")],
-           action = "delete",
-           )
-
-      extract_cmd = ("unzip", "-o", "-j", "-q", jce_curl_target, "-d", security_dir)
-      Execute(extract_cmd,
-              only_if = format("test -e {security_dir} && test -f {jce_curl_target}"),
-              path = ['/bin/','/usr/bin'],
-              sudo = True
-      )

http://git-wip-us.apache.org/repos/asf/ambari/blob/ceec30a9/contrib/utils/perf/deploy-gce-perf-cluster.py
----------------------------------------------------------------------
diff --git a/contrib/utils/perf/deploy-gce-perf-cluster.py b/contrib/utils/perf/deploy-gce-perf-cluster.py
index fe5f22d..73c353e 100644
--- a/contrib/utils/perf/deploy-gce-perf-cluster.py
+++ b/contrib/utils/perf/deploy-gce-perf-cluster.py
@@ -384,7 +384,7 @@ def create_agent_script(server_host_name):
   # TODO, instead of cloning Ambari repo on each VM, do it on the server once and distribute
to all of the agents.
   contents = "#!/bin/bash\n" + \
   "wget -O /etc/yum.repos.d/ambari.repo {0}\n".format(ambari_repo_file_url) + \
-  "yum clean all; yum install git ambari-agent -y\n" + \
+  "yum clean all; yum install krb5-workstation git ambari-agent -y\n" + \
   "mkdir /home ; cd /home; git clone https://github.com/apache/ambari.git ; cd ambari ; git
checkout branch-2.5\n" + \
   "cp -r /home/ambari/ambari-server/src/main/resources/stacks/PERF /var/lib/ambari-agent/cache/stacks/PERF\n"
+ \
   "sed -i -e 's/hostname=localhost/hostname={0}/g' /etc/ambari-agent/conf/ambari-agent.ini\n".format(server_host_name)
+ \


Mime
View raw message