ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject git commit: AMBARI-6678. Host registration hanging (and timing-out) on SLES during setupAgent.py.(vbrodetskyi)
Date Wed, 30 Jul 2014 16:34:07 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 7830b3fe2 -> 88156a386


AMBARI-6678. Host registration hanging (and timing-out) on SLES during setupAgent.py.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: 88156a3861778ac0813f1adabc121ca550bf9da0
Parents: 7830b3f
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Wed Jul 30 18:09:15 2014 +0300
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Wed Jul 30 18:09:15 2014 +0300

----------------------------------------------------------------------
 ambari-server/src/main/python/setupAgent.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/88156a38/ambari-server/src/main/python/setupAgent.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/setupAgent.py b/ambari-server/src/main/python/setupAgent.py
index 7de92ff..2bb7b53 100755
--- a/ambari-server/src/main/python/setupAgent.py
+++ b/ambari-server/src/main/python/setupAgent.py
@@ -45,7 +45,7 @@ def installAgent(projectVersion):
   """ Run install and make sure the agent install alright """
   # The command doesn't work with file mask ambari-agent*.rpm, so rename it on agent host
   if OSCheck.is_suse_family():
-    Command = ["zypper", "install", "-y", "ambari-agent-" + projectVersion]
+    Command = ["zypper", "--no-gpg-checks", "install", "-y", "ambari-agent-" + projectVersion]
   elif OSCheck.is_debian_family():
     # add * to end of version in case of some test releases
     Command = ["apt-get", "install", "-y", "--allow-unauthenticated", "ambari-agent=" + projectVersion
+ "*"]
@@ -101,7 +101,7 @@ def findNearestAgentPackageVersion(projectVersion):
   if projectVersion == "":
     projectVersion = "  "
   if OSCheck.is_suse_family():
-    Command = ["bash", "-c", "zypper -q search -s --match-exact ambari-agent | grep '" +
projectVersion +
+    Command = ["bash", "-c", "zypper --no-gpg-checks -q search -s --match-exact ambari-agent
| grep '" + projectVersion +
                                  "' | cut -d '|' -f 4 | head -n1 | sed -e 's/-\w[^:]*//1'
"]
   elif OSCheck.is_debian_family():
     if projectVersion == "  ":
@@ -130,7 +130,7 @@ def isAgentPackageAlreadyInstalled(projectVersion):
 def getAvaliableAgentPackageVersions():
   if OSCheck.is_suse_family():
     Command = ["bash", "-c",
-        "zypper -q search -s --match-exact ambari-agent | grep ambari-agent | sed -re 's/\s+/
/g' | cut -d '|' -f 4 | tr '\\n' ', ' | sed -s 's/[-|~][A-Za-z0-9]*//g'"]
+        "zypper --no-gpg-checks -q search -s --match-exact ambari-agent | grep ambari-agent
| sed -re 's/\s+/ /g' | cut -d '|' -f 4 | tr '\\n' ', ' | sed -s 's/[-|~][A-Za-z0-9]*//g'"]
   elif OSCheck.is_debian_family():
     Command = ["bash", "-c",
         "apt-cache -q show ambari-agent|grep 'Version\:'|cut -d ' ' -f 2| tr '\\n' ', '|sed
-s 's/[-|~][A-Za-z0-9]*//g'"]


Mime
View raw message