AMBARI-9672. Adding Ranger service failed to install ranger packages (dlysnichenko)

ambari-server/src/main/resources/common-services/RANGER/0.4.0/metainfo.xml

@@ -58,13 +58,24 @@
 
       <osSpecifics>
         <osSpecific>
-          <osFamily>redhat5,redhat6,suse11,ubuntu12</osFamily>
+          <osFamily>redhat5,redhat6,suse11</osFamily>
           <packages>
             <package>
-              <name>ranger-admin</name>                                
+              <name>ranger_2_2_*-admin</name>                                
             </package>
             <package>
-              <name>ranger-usersync</name>
+              <name>ranger_2_2_*-usersync</name>
+            </package>                           
+          </packages>                        
+        </osSpecific>
+        <osSpecific>
+          <osFamily>ubuntu12</osFamily>
+          <packages>
+            <package>
+              <name>ranger-2-2-.*-admin</name>                                
+            </package>
+            <package>
+              <name>ranger-2-2-.*-usersync</name>
             </package>                           
           </packages>                        
         </osSpecific>

ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger.py

@@ -42,7 +42,7 @@ def setup_ranger():
     if os.path.isfile(file_path):
       shutil.copyfile(file_path, params.ranger_home + '/install-bk.properties')
     else:
-      raise Fail('Ranger admin install.properties file doesnot exist')
+      raise Fail('Ranger admin {0} file does not exist'.format(file_path))
 
     write_properties_to_file(file_path, admin_properties())
     ##if db flavor == oracle - set oracle home env variable

ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/upgrade.py

@@ -20,10 +20,9 @@ limitations under the License.
 """
 from resource_management import *
 from resource_management.core.resources.system import Execute
-from resource_management.libraries.functions.version import compare_versions, format_hdp_stack_version
 
 def prestart(env, hdp_component):
   import params
 
-  if params.version and compare_versions(format_hdp_stack_version(params.version), '2.2.0.0') >= 0:
+  if params.version and params.stack_is_hdp22_or_further:
     Execute("hdp-select set {0} {1}".format(hdp_component, params.version))