Browse Source

AMBARI-18537. Update Mirosoft R version in mpack (Balázs Bence Sári via magyari_sandor)

Balázs Bence Sári 9 years ago
parent
commit
5ef89d5b69
13 changed files with 7 additions and 7 deletions
  1. 0 0
      contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/kerberos.json
  2. 1 1
      contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/metainfo.xml
  3. 0 0
      contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/files/microsoft_r_serviceCheck.r
  4. 0 0
      contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/microsoft_r.py
  5. 0 0
      contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params.py
  6. 0 0
      contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params_linux.py
  7. 0 0
      contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params_windows.py
  8. 0 0
      contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/service_check.py
  9. 0 0
      contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/role_command_order.json
  10. 1 1
      contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/service_advisor.py
  11. 2 2
      contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/metainfo.xml
  12. 2 2
      contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/repos/repoinfo.xml
  13. 1 1
      contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json

+ 0 - 0
contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/kerberos.json → contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/kerberos.json


+ 1 - 1
contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/metainfo.xml → contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/metainfo.xml

@@ -23,7 +23,7 @@
       <name>MICROSOFT_R</name>
       <displayName>Microsoft R</displayName>
       <comment>Microsoft R Server</comment>
-      <version>8.0.0</version>
+      <version>8.0.5</version>
 
       <components>
         <component>

+ 0 - 0
contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/files/microsoft_r_serviceCheck.r → contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/files/microsoft_r_serviceCheck.r


+ 0 - 0
contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/scripts/microsoft_r.py → contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/microsoft_r.py


+ 0 - 0
contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/scripts/params.py → contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params.py


+ 0 - 0
contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/scripts/params_linux.py → contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params_linux.py


+ 0 - 0
contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/scripts/params_windows.py → contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/params_windows.py


+ 0 - 0
contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/package/scripts/service_check.py → contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/package/scripts/service_check.py


+ 0 - 0
contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/role_command_order.json → contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/role_command_order.json


+ 1 - 1
contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.0/service_advisor.py → contrib/management-packs/microsoft-r_mpack/src/main/resources/common-services/MICROSOFT_R/8.0.5/service_advisor.py

@@ -34,7 +34,7 @@ except Exception as e:
   traceback.print_exc()
   print "Failed to load parent"
 
-class MICROSOFT_R800ServiceAdvisor(service_advisor.ServiceAdvisor):
+class MICROSOFT_R805ServiceAdvisor(service_advisor.ServiceAdvisor):
 
   def colocateService(self, hostsComponentsMap, serviceComponents):
     # colocate R_SERVER_CLIENT with NODEMANAGERs and YARN_CLIENTs

+ 2 - 2
contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/metainfo.xml → contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/metainfo.xml

@@ -21,8 +21,8 @@
   <services>
     <service>
       <name>MICROSOFT_R</name>
-      <extends>common-services/MICROSOFT_R/8.0.0</extends>
-      <version>8.0.0.0</version>
+      <extends>common-services/MICROSOFT_R/8.0.5</extends>
+      <version>8.0.5.0</version>
     </service>
   </services>
 </metainfo>

+ 2 - 2
contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.0/repos/repoinfo.xml → contrib/management-packs/microsoft-r_mpack/src/main/resources/custom-services/MICROSOFT_R/8.0.5/repos/repoinfo.xml

@@ -19,14 +19,14 @@
     <os family="redhat6">
         <repo>
             <baseurl>http://PLEASE_ENTER_REPO_URL</baseurl>
-            <repoid>MSFT_R-8.1</repoid>
+            <repoid>MSFT_R-8.0</repoid>
             <reponame>MSFT_R</reponame>
         </repo>
     </os>
     <os family="suse11">
         <repo>
             <baseurl>http://PLEASE_ENTER_REPO_URL</baseurl>
-            <repoid>MSFT_R-8.1</repoid>
+            <repoid>MSFT_R-8.0</repoid>
             <reponame>MSFT_R</reponame>
         </repo>
     </os>

+ 1 - 1
contrib/management-packs/microsoft-r_mpack/src/main/resources/mpack.json

@@ -25,7 +25,7 @@
       "service_versions_map": [
         {
           "service_name" : "MICROSOFT_R",
-          "service_version" : "8.0.0",
+          "service_version" : "8.0.5",
           "applicable_stacks" : [
             {
               "stack_name" : "HDP",