AMBARI-18554. Improve package handling in Microsoft R Server Mpack (Balázs Bence Sári via magyari_sandor)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0d7689d8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0d7689d8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0d7689d8 Branch: refs/heads/branch-dev-patch-upgrade Commit: 0d7689d844c1099facc6f6c6c10ba19f786de28a Parents: da7b2ae Author: Balázs Bence Sári <bs...@hortonworks.com> Authored: Mon Oct 10 17:49:51 2016 +0200 Committer: Sandor Magyari <smagy...@hortonworks.com> Committed: Mon Oct 10 17:49:51 2016 +0200 ---------------------------------------------------------------------- .../8.0.5/package/scripts/microsoft_r.py | 11 +---------- .../MICROSOFT_R/8.0.5/metainfo.xml | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0d7689d8/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/microsoft_r.py ---------------------------------------------------------------------- diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/microsoft_r.py b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/microsoft_r.py index 382bd0f..f6eb33e 100644 --- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/microsoft_r.py +++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/microsoft_r.py @@ -22,22 +22,13 @@ from resource_management.core.logger import Logger from resource_management.core.resources import Package -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)) - - for rpm in rpms: - Logger.info('Installing {0}'.format(rpm)) - Package(rpm) - + self.install_packages(env) Logger.info('Installed R Server') def configure(self, env): http://git-wip-us.apache.org/repos/asf/ambari/blob/0d7689d8/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/metainfo.xml ---------------------------------------------------------------------- diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/metainfo.xml b/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/metainfo.xml index 31d5225..9470d22 100644 --- a/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/metainfo.xml +++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/metainfo.xml @@ -23,6 +23,25 @@ <name>MICROSOFT_R</name> <extends>common-services/MICROSOFT_R/8.0.5</extends> <version>8.0.5.0</version> + <osSpecifics> + <osSpecific> + <osFamily>redhat6,redhat7,suse11</osFamily> + <packages> + <package> + <name>microsoft-r-server-mro-8.0</name> + </package> + <package> + <name>microsoft-r-server-intel-mkl-8.0</name> + </package> + <package> + <name>microsoft-r-server-packages-8.0</name> + </package> + <package> + <name>microsoft-r-server-hadoop-8.0</name> + </package> + </packages> + </osSpecific> + </osSpecifics> </service> </services> </metainfo>
