support SUSE linux

Author: keyki

Makefile

@@ -1,6 +1,6 @@
 BINARY=salt-bootstrap
 
-VERSION=0.12.1
+VERSION=0.12.2
 BUILD_TIME=$(shell date +%FT%T)
 LDFLAGS=-ldflags "-X github.com/hortonworks/salt-bootstrap/saltboot.Version=${VERSION} -X github.com/hortonworks/salt-bootstrap/saltboot.BuildTime=${BUILD_TIME}"
 GOFILES = $(shell find . -type f -name '*.go')

saltboot/cmdExecutor.go

@@ -1,24 +1,23 @@
 package saltboot
 
 import (
+	"errors"
+	"fmt"
 	"log"
 	"os/exec"
 	"strings"
 )
 
-const (
-	ENV_TYPE = "SALT_BOOTSTRAP_ENV_TYPE"
-)
-
 var commandExecutor = func(executable string, args ...string) ([]byte, error) {
 	return exec.Command(executable, args...).CombinedOutput()
 }
 
 func ExecCmd(executable string, args ...string) (outStr string, err error) {
-	log.Printf("[cmdExecutor] Execute command: %s %s", executable, strings.Join(args, " "))
+	command := executable + " " + strings.Join(args, " ")
+	log.Printf("[cmdExecutor] Execute command: %s", command)
 	out, e := commandExecutor(executable, args...)
 	if e != nil {
-		err = e
+		err = errors.New(fmt.Sprintf("Failed to execute command: '%s', err: %s", command, e.Error()))
 	}
 	if out != nil {
 		outStr = strings.TrimSpace(string(out))

saltboot/hostname.go

@@ -9,6 +9,7 @@ import (
 const EXAMPLE_DOMAIN = ".example.com"
 const HOSTS_FILE = "/etc/hosts"
 const NETWORK_SYSCONFIG_FILE = "/etc/sysconfig/network"
+const NETWORK_SYSCONFIG_FILE_SUSE = "/etc/sysconfig/network/config"
 const HOSTNAME_FILE = "/etc/hostname"
 
 var readFile = ioutil.ReadFile
@@ -23,7 +24,12 @@ func getFQDN() (string, error) {
 }
 
 func getHostName() (string, error) {
-	return ExecCmd("hostname", "-s")
+	out, err := ExecCmd("hostname", "-s")
+	if err != nil {
+		log.Printf("[getHostName] hostname -s returned an error, fallback to simple hostname command, err: %s", err.Error())
+		out, err = ExecCmd("hostname")
+	}
+	return out, err
 }
 
 func getDomain() (string, error) {
@@ -71,7 +77,11 @@ func ensureHostIsResolvable(customHostname *string, customDomain string) error {
 		log.Printf("[ensureHostIsResolvable] [ERROR] unable to update host file: %s", err.Error())
 		return err
 	}
-	if err := updateSysConfig(hostName, domain, NETWORK_SYSCONFIG_FILE); err != nil {
+	networkSysConfig := NETWORK_SYSCONFIG_FILE
+	if isOs(SUSE) {
+		networkSysConfig = NETWORK_SYSCONFIG_FILE_SUSE
+	}
+	if err := updateSysConfig(hostName, domain, networkSysConfig); err != nil {
 		log.Printf("[ensureHostIsResolvable] [ERROR] unable to update sys config: %s", err.Error())
 		return err
 	}
@@ -128,7 +138,7 @@ func updateSysConfig(hostName string, domain string, file string) error {
 		return err
 	}
 	sysConfig := string(b)
-	log.Printf("[updateSysConfig] original sysconfig: %s", sysConfig)
+	log.Printf("[updateSysConfig] original sysconfig %s: %s", file, sysConfig)
 
 	lines := strings.Split(sysConfig, "\n")
 	var filteredLines = make([]string, 0)
@@ -140,21 +150,19 @@ func updateSysConfig(hostName string, domain string, file string) error {
 
 	hostNameString := "HOSTNAME=" + hostName + domain
 	sysConfig = strings.Join(filteredLines, "\n") + "\n" + hostNameString
-	log.Printf("[updateSysConfig] updated sysconfig: %s", sysConfig)
+	log.Printf("[updateSysConfig] updated sysconfig %s: %s", file, sysConfig)
 	err = writeFile(file, []byte(sysConfig), 0644)
 	if err != nil {
 		return err
 	}
-
 	return nil
 }
 
 func updateHostNameFile(hostName string, file string) error {
-	log.Printf("[updateHostNameFile] hostname: %s", hostName)
+	log.Printf("[updateHostNameFile] hostname: %s, file: %s", hostName, file)
 	err := writeFile(file, []byte(hostName), 0644)
 	if err != nil {
 		return err
 	}
-
 	return nil
 }

saltboot/salt_test.go

@@ -67,7 +67,6 @@ func TestSaltMinionRunRequestHandler(t *testing.T) {
 	defer func() { watchCommands = false }()
 
 	tempDirName, _ := ioutil.TempDir("", "saltminionruntest")
-	defer os.RemoveAll(tempDirName)
 
 	request := SaltActionRequest{
 		Master: SaltMaster{Address: "address"},
@@ -106,13 +105,15 @@ func TestSaltMinionRunRequestHandler(t *testing.T) {
 		if err != nil {
 			t.Errorf("couldn't unmarshall grain yaml: %s", err)
 		}
+		os.RemoveAll(tempDirName)
 	}()
 
 	checkExecutedCommands([]string{
 		"hostname -s",
 		"hostname -d",
 		"hostname -I",
 		"hostname ",
+		"grep SUSE /etc/issue",
 		"ps aux",
 		"/bin/systemctl start salt-minion",
 		"/bin/systemctl enable salt-minion",
@@ -166,9 +167,11 @@ func TestSaltServerRunRequestHandler(t *testing.T) {
 		"hostname -d",
 		"hostname -I",
 		"hostname ",
+		"grep SUSE /etc/issue",
 		"grep saltuser /etc/passwd",
 		"grep Ubuntu /etc/issue",
 		"grep Debian /etc/issue",
+		"grep SUSE /etc/issue",
 		"^adduser --no-create-home -G wheel -s /sbin/nologin --password \\$6\\$([a-zA-Z\\$0-9/.]+) saltuser",
 		"ps aux",
 		"/bin/systemctl start salt-master",

saltboot/user.go

@@ -8,12 +8,14 @@ import (
 
 	"github.com/hortonworks/salt-bootstrap/saltboot/model"
 	"github.com/kless/osutil/user/crypt/sha512_crypt"
+	"strings"
 )
 
 const (
 	SALT_USER = "saltuser"
 	UBUNTU    = "Ubuntu"
 	DEBIAN    = "Debian"
+	SUSE      = "SUSE"
 )
 
 func init() {
@@ -34,7 +36,7 @@ func CreateUser(saltMaster SaltMaster) (resp model.Response, err error) {
 
 	result := "Create user: OK"
 
-	//saltUser, _ := user.Lookup(SALT_USER) //requires cgo
+	// saltUser, _ := user.Lookup(SALT_USER) //requires cgo
 	out, err := ExecCmd("grep", SALT_USER, "/etc/passwd")
 
 	if len(out) == 0 || err != nil {
@@ -50,8 +52,12 @@ func CreateUser(saltMaster SaltMaster) (resp model.Response, err error) {
 			return model.Response{ErrorText: err.Error(), StatusCode: http.StatusInternalServerError}, err
 		}
 
-		if isDebianOrUbuntu() {
+		if shouldUseUserAdd() {
 			result, err = ExecCmd("groupadd", "-r", "wheel")
+			if err != nil && strings.Contains(err.Error(), "exit status 9") {
+				log.Printf("[CreateUser] ignore group exists error: %s", err.Error())
+				err = nil
+			}
 			if err == nil {
 				result, err = ExecCmd("useradd", "--no-create-home", "-G", "wheel", "-s", "/sbin/nologin", "--password", hash, SALT_USER)
 			}
@@ -71,8 +77,8 @@ func CreateUser(saltMaster SaltMaster) (resp model.Response, err error) {
 	return resp, nil
 }
 
-func isDebianOrUbuntu() bool {
-	return isOs(UBUNTU) || isOs(DEBIAN)
+func shouldUseUserAdd() bool {
+	return isOs(UBUNTU) || isOs(DEBIAN) || isOs(SUSE)
 }
 
 func isOs(os string) bool {

saltboot/user_test.go

@@ -18,6 +18,7 @@ func TestCreateUser(t *testing.T) {
 		"grep saltuser /etc/passwd",
 		"grep Ubuntu /etc/issue",
 		"grep Debian /etc/issue",
+		"grep SUSE /etc/issue",
 		"^adduser --no-create-home -G wheel -s /sbin/nologin --password \\$6\\$([a-zA-Z\\$0-9/.]+) saltuser",
 	}, t)
 }