Revert. "AMBARI-10180. Repo validation doesn't pass on debian7 (aonishuk)"

ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java

@@ -33,7 +33,6 @@ import org.apache.ambari.server.orm.PersistenceType;
 import org.apache.ambari.server.security.ClientSecurityType;
 import org.apache.ambari.server.security.authorization.LdapServerProperties;
 import org.apache.ambari.server.security.encryption.CredentialProvider;
-import org.apache.ambari.server.state.stack.OsFamily;
 import org.apache.ambari.server.utils.ShellCommandUtil;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.RandomStringUtils;
@@ -41,7 +40,6 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 
@@ -51,9 +49,6 @@ import com.google.inject.Singleton;
  */
 @Singleton
 public class Configuration {
-  
-  @Inject
-  private OsFamily osFamily;
 
   public static final String CONFIG_FILE = "ambari.properties";
   public static final String BOOTSTRAP_DIR = "bootstrap.dir";
@@ -303,6 +298,8 @@ public class Configuration {
   private static final String SERVER_PERSISTENCE_TYPE_DEFAULT = "local";
   private static final String SERVER_CONNECTION_MAX_IDLE_TIME = "server.connection.max.idle.millis";
 
+  private static final String UBUNTU_OS = "ubuntu12";
+
   /**
    * Default for repo validation suffixes.
    */
@@ -1142,11 +1139,10 @@ public class Configuration {
   /**
    * @return a string array of suffixes used to validate repo URLs.
    */
-  public String[] getRepoValidationSuffixes(String osType) {
-    String osFamily = this.osFamily.find_family(osType);
+  public String[] getRepoValidationSuffixes(String osFamily) {
     String repoSuffixes;
 
-    if(osFamily.equals(OsFamily.UBUNTU_FAMILY)) {
+    if(osFamily.equals(UBUNTU_OS)) {
       repoSuffixes = properties.getProperty(REPO_SUFFIX_KEY_UBUNTU,
           REPO_SUFFIX_UBUNTU);
     } else {

ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java

@@ -108,9 +108,7 @@ public class LatestRepoCallable implements Callable<Void> {
               // Agents do the reverse action (take the base url, and append <name>.repo)
 
               String repo_file_format;
-              String osFamily = os_family.find_family(ri.getOsType());
-              
-              if(osFamily.equals(OsFamily.UBUNTU_FAMILY)) {
+              if(ri.getOsType().equals("ubuntu12")) {
                 repo_file_format = "list";
               } else {
                 repo_file_format = "repo";

ambari-server/src/main/java/org/apache/ambari/server/state/stack/OsFamily.java

@@ -41,8 +41,6 @@ import org.apache.commons.io.IOUtils;
  */
 @Singleton
 public class OsFamily {
-    public final static String UBUNTU_FAMILY = "ubuntu";
-    
     private final String os_pattern = "([^\\d]*)([\\d]*)";
     private final String OS_DISTRO = "distro";
     private final String OS_VERSION = "versions";
@@ -126,7 +124,7 @@ public class OsFamily {
     }
 
     /**
-     * Finds the family for the specific OS + it's version number
+     * Finds the family for the specific OS
      * @param os the OS
      * @return the family, or <code>null</code> if not defined
      */
@@ -140,22 +138,6 @@ public class OsFamily {
       }
       return null;
     }
-    
-    /**
-     * Finds the family for the specific OS
-     * @param os the OS
-     * @return the family, or <code>null</code> if not defined
-     */
-    public String find_family(String os) {
-      Map<String,String>  pos = parse_os(os);
-      for ( String family : osMap.keySet()) {
-        Map<String, Set<String>> fam = osMap.get(family);
-        if (fam.get(OS_DISTRO).contains(pos.get(OS_DISTRO)) && fam.get(OS_VERSION).contains(pos.get(OS_VERSION))){
-          return family;
-        }
-      }
-      return null;
-    }
 
     /**
      * Form list of all supported os types

ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java

@@ -23,7 +23,6 @@ import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 import com.google.inject.persist.Transactional;
-
 import org.apache.ambari.server.api.resources.ResourceInstanceFactoryImpl;
 import org.apache.ambari.server.api.resources.SubResourceDefinition;
 import org.apache.ambari.server.api.resources.ViewExternalSubResourceDefinition;
@@ -34,7 +33,6 @@ import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.AmbariServer;
 import org.apache.ambari.server.controller.AmbariSessionManager;
-import org.apache.ambari.server.controller.ControllerModule;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.ResourceProvider;
 import org.apache.ambari.server.orm.dao.MemberDAO;
@@ -86,7 +84,6 @@ import org.springframework.security.core.GrantedAuthority;
 import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
-
 import java.beans.IntrospectionException;
 import java.io.File;
 import java.util.Collection;
@@ -260,7 +257,7 @@ public class ViewRegistry {
       String archivePath = args[1];
 
       try {
-        Injector injector = Guice.createInjector(new ControllerModule());
+        Injector injector = Guice.createInjector();
 
         ViewExtractor      extractor      = injector.getInstance(ViewExtractor.class);
         ViewArchiveUtility archiveUtility = injector.getInstance(ViewArchiveUtility.class);

ambari-server/src/main/resources/stacks/HDP/2.3/repos/repoinfo.xml

@@ -77,4 +77,16 @@
       <reponame>HDP-UTILS</reponame>
     </repo>
   </os>
+  <os family="ubuntu7">
+    <repo>
+      <baseurl>http://s3.amazonaws.com/dev.hortonworks.com/HDP/debian6/2.x/updates/2.3.0.0</baseurl>
+      <repoid>HDP-2.3</repoid>
+      <reponame>HDP</reponame>
+    </repo>
+    <repo>
+      <baseurl>http://public-repo-1.hortonworks.com/HDP-UTILS-1.1.0.20/repos/debian6</baseurl>
+      <repoid>HDP-UTILS-1.1.0.20</repoid>
+      <reponame>HDP-UTILS</reponame>
+    </repo>
+  </os>
 </reposinfo>