set fail-swap-on to false for cluster up

Author: mfojtik

pkg/oc/bootstrap/docker/openshift/helper.go

@@ -887,6 +887,9 @@ func (h *Helper) updateConfig(configDir string, opt *StartOptions) error {
 		nodeCfg.DNSIP = ""
 	}
 	nodeCfg.DNSBindAddress = ""
+	if nodeCfg.KubeletArguments == nil {
+		nodeCfg.KubeletArguments = configapi.ExtendedArguments{}
+	}
 
 	if h.supportsCgroupDriver() {
 		// Set the cgroup driver from the current docker
@@ -895,11 +898,9 @@ func (h *Helper) updateConfig(configDir string, opt *StartOptions) error {
 			return err
 		}
 		glog.V(5).Infof("cgroup driver from Docker: %s", cgroupDriver)
-		if nodeCfg.KubeletArguments == nil {
-			nodeCfg.KubeletArguments = configapi.ExtendedArguments{}
-		}
 		nodeCfg.KubeletArguments["cgroup-driver"] = []string{cgroupDriver}
 	}
+	nodeCfg.KubeletArguments["fail-swap-on"] = []string{"false"}
 
 	cfgBytes, err = configapilatest.WriteYAML(nodeCfg)
 	if err != nil {

pkg/oc/bootstrap/docker/up.go

@@ -1140,11 +1140,7 @@ func (c *ClientStartConfig) InstallTemplateServiceBroker(out io.Writer) error {
 	}
 	// TODO we want to use this eventually, but until we have our own image for TSB, we have to hardcode this origin
 	//return c.OpenShiftHelper().InstallTemplateServiceBroker(f, c.imageFormat())
-	err = c.OpenShiftHelper().InstallTemplateServiceBroker(f, imageTemplate, c.ServerLogLevel)
-	if err != nil {
-		glog.Errorf("error installing tsb: %v", err)
-	}
-	return nil
+	return c.OpenShiftHelper().InstallTemplateServiceBroker(f, imageTemplate, c.ServerLogLevel)
 }
 
 // RegisterTemplateServiceBroker will register the tsb with the service catalog
@@ -1153,11 +1149,7 @@ func (c *ClientStartConfig) RegisterTemplateServiceBroker(out io.Writer) error {
 	if err != nil {
 		return err
 	}
-	err = c.OpenShiftHelper().RegisterTemplateServiceBroker(f, c.LocalConfigDir)
-	if err != nil {
-		glog.Errorf("error registering tsb: %v", err)
-	}
-	return nil
+	return c.OpenShiftHelper().RegisterTemplateServiceBroker(f, c.LocalConfigDir)
 }
 
 // Login logs into the new server and sets up a default user and project