ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [33/35] ambari git commit: AMBARI-15538. Support service-specific repo for add-on services. (Balazs Bence Sari via stoader).
Date Wed, 14 Sep 2016 18:32:53 GMT
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e4515c4/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/ADDON/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/ADDON/repos/repoinfo.xml
b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/ADDON/repos/repoinfo.xml
new file mode 100644
index 0000000..8d7c255
--- /dev/null
+++ b/ambari-server/src/test/resources/stacks_with_common_services/HDP/0.2/services/ADDON/repos/repoinfo.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<reposinfo>
+    <os family="redhat6">
+        <repo>
+            <baseurl>http:add.on/repo</baseurl>
+            <repoid>ADDON_REPO-1.0</repoid>
+            <reponame>ADDON_REPO</reponame>
+        </repo>
+    </os>
+</reposinfo>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e4515c4/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/configuration/microsoft-r-env.xml
----------------------------------------------------------------------
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/configuration/microsoft-r-env.xml
b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/configuration/microsoft-r-env.xml
new file mode 100644
index 0000000..5bc4a31
--- /dev/null
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/configuration/microsoft-r-env.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<!-- This is a special config file for properties used to monitor status of the service
-->
+<configuration supports_adding_forbidden="true">
+    <property>
+        <name>R Open Version</name>
+        <display-name>Version of R Open</display-name>
+        <description>Version of R Open</description>
+        <value>3.2.2</value>
+        <value-attributes>
+            <type>string</type>
+            <overridable>false</overridable>
+        </value-attributes>
+        <on-ambari-upgrade add="true"/>
+    </property>
+</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e4515c4/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')
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0e4515c4/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/repos/repoinfo.xml
----------------------------------------------------------------------
diff --git a/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/repos/repoinfo.xml
b/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/repos/repoinfo.xml
new file mode 100644
index 0000000..4c82514
--- /dev/null
+++ b/contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/repos/repoinfo.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<reposinfo>
+    <os family="redhat6">
+        <repo>
+            <baseurl>http://104.196.87.250/msft-r/MICROSOFT_R-8.0/</baseurl>
+            <repoid>MSFT_R-8.1</repoid>
+            <reponame>MSFT_R</reponame>
+        </repo>
+    </os>
+    <os family="redhat5">
+        <repo>
+            <baseurl>http://104.196.87.250/msft-r/MICROSOFT_R-8.0/</baseurl>
+            <repoid>MSFT_R-8.1</repoid>
+            <reponame>MSFT_R</reponame>
+        </repo>
+    </os>
+</reposinfo>


Mime
View raw message