Merge pull request #3560 from afbjorklund/service

Still generate docker.service unit, even if unused
kubernetes · Jan 25, 2019 · 31eb53c · 31eb53c
2 parents 6c05e28 + 6f90968
commit 31eb53c
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/pkg/provision/buildroot.go b/pkg/provision/buildroot.go
@@ -294,10 +294,6 @@ func configureAuth(p *BuildrootProvisioner) error {
 		return errors.Wrap(err, "getting cluster config")
 	}
 
-	if config.MachineConfig.ContainerRuntime != "" {
-		return nil
-	}
-
 	dockerCfg, err := p.GenerateDockerOptions(engine.DefaultPort)
 	if err != nil {
 		return errors.Wrap(err, "generating docker options")
@@ -309,12 +305,15 @@ func configureAuth(p *BuildrootProvisioner) error {
 		return err
 	}
 
-	if err := p.Service("docker", serviceaction.Enable); err != nil {
-		return err
-	}
+	if config.MachineConfig.ContainerRuntime == "" {
 
-	if err := p.Service("docker", serviceaction.Restart); err != nil {
-		return err
+		if err := p.Service("docker", serviceaction.Enable); err != nil {
+			return err
+		}
+
+		if err := p.Service("docker", serviceaction.Restart); err != nil {
+			return err
+		}
 	}
 
 	return nil