From 419f26d4da7c8eaafeeee18558bd0ecdc92b3753 Mon Sep 17 00:00:00 2001
From: Michal Fojtik <mfojtik@redhat.com>
Date: Wed, 8 Nov 2017 10:59:17 +0100
Subject: [PATCH] set fail-swap-on to false for cluster up

---
 pkg/oc/bootstrap/docker/openshift/helper.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkg/oc/bootstrap/docker/openshift/helper.go b/pkg/oc/bootstrap/docker/openshift/helper.go
index 263c749181aa..407c0bdae436 100644
--- a/pkg/oc/bootstrap/docker/openshift/helper.go
+++ b/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 {