You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by st...@apache.org on 2016/10/03 09:15:43 UTC

ambari git commit: AMBARI-15538. Support service-specific repo for add-on services (part2). (Balazs Bence Sari via stoader)

Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 5b9bc932e -> bac68f745


AMBARI-15538. Support service-specific repo for add-on services (part2). (Balazs Bence Sari via stoader)


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

Branch: refs/heads/branch-2.4
Commit: bac68f74591306860fb8e4cfa19a2ae75431f4b3
Parents: 5b9bc93
Author: Balazs Bence Sari <bs...@hortonworks.com>
Authored: Mon Oct 3 11:15:38 2016 +0200
Committer: Toader, Sebastian <st...@hortonworks.com>
Committed: Mon Oct 3 11:15:38 2016 +0200

----------------------------------------------------------------------
 .../8.0.0/package/scripts/microsoft_r.py        | 22 +++++++-------------
 1 file changed, 8 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/bac68f74/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/scripts/microsoft_r.py
----------------------------------------------------------------------
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/scripts/microsoft_r.py b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/scripts/microsoft_r.py
index 61ea96b..382bd0f 100644
--- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/scripts/microsoft_r.py
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/scripts/microsoft_r.py
@@ -19,30 +19,24 @@ limitations under the License.
 """
 from resource_management.libraries.script import Script
 from resource_management.core.logger import Logger
-from resource_management.core.source import DownloadSource
-from resource_management.core.resources import File, Package
+from resource_management.core.resources import Package
 
-rpm_location = 'http://104.196.87.250/msft-r/8.1/'
-rpms = ['microsoft-r-server-mro-8.0.rpm',
-        'microsoft-r-server-intel-mkl-8.0.rpm',
-        'microsoft-r-server-packages-8.0.rpm',
-        'microsoft-r-server-hadoop-8.0.rpm']
+
+rpms = ['microsoft-r-server-mro-8.0',
+        'microsoft-r-server-intel-mkl-8.0',
+        'microsoft-r-server-packages-8.0',
+        'microsoft-r-server-hadoop-8.0']
 
 class MicrosoftR(Script):
+
   def install(self, env):
     Logger.info('Installing R Server Client...')
     tmp_dir = Script.tmp_dir
     Logger.debug('Using temp dir: {0}'.format(tmp_dir))
-    Logger.info("Will download and install the following rpm's from {0}: {1}".format(rpm_location, rpms))
 
     for rpm in rpms:
-      Logger.info('Downloading {0}'.format(rpm))
-      rpmFile = '{0}/{1}'.format(tmp_dir, rpm)
-      File(rpmFile, \
-           content = DownloadSource(rpm_location + rpm), \
-           mode = 0644)
       Logger.info('Installing {0}'.format(rpm))
-      Package(rpmFile)
+      Package(rpm)
 
     Logger.info('Installed R Server')