BUG-100214 fix issue when multiple network interfaces are present

Author: keyki

Makefile

@@ -1,6 +1,6 @@
 BINARY=salt-bootstrap
 
-VERSION=0.12.2
+VERSION=0.12.3
 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/hostname.go

@@ -15,10 +15,6 @@ const HOSTNAME_FILE = "/etc/hostname"
 var readFile = ioutil.ReadFile
 var writeFile = ioutil.WriteFile
 
-func getIpv4Address() (string, error) {
-	return ExecCmd("hostname", "-I")
-}
-
 func getFQDN() (string, error) {
 	return ExecCmd("hostname", "-f")
 }
@@ -41,7 +37,7 @@ func setHostname(hostName string) (string, error) {
 }
 
 // This is required due to: https://github.com/saltstack/salt/issues/32719
-func ensureHostIsResolvable(customHostname *string, customDomain string) error {
+func ensureHostIsResolvable(customHostname *string, customDomain string, ipv4address string) error {
 	var hostName string
 	if customHostname != nil && len(*customHostname) > 0 {
 		log.Printf("[ensureHostIsResolvable] use custom hostname: %s", *customHostname)
@@ -73,7 +69,7 @@ func ensureHostIsResolvable(customHostname *string, customDomain string) error {
 		domain = "." + domain
 	}
 
-	if err := updateHostsFile(hostName, domain, HOSTS_FILE, getIpv4Address); err != nil {
+	if err := updateHostsFile(hostName, domain, HOSTS_FILE, ipv4address); err != nil {
 		log.Printf("[ensureHostIsResolvable] [ERROR] unable to update host file: %s", err.Error())
 		return err
 	}
@@ -92,27 +88,22 @@ func ensureHostIsResolvable(customHostname *string, customDomain string) error {
 	return nil
 }
 
-func updateHostsFile(hostName string, domain string, file string, getIpv4Address func() (string, error)) error {
-	ip, err := getIpv4Address()
-	if err != nil {
-		return err
-	}
-
-	log.Printf("[updateHostsFile] hostName: %s, domain: %s, ip: %s", hostName, domain, ip)
+func updateHostsFile(hostName string, domain string, file string, ipv4address string) error {
+	log.Printf("[updateHostsFile] hostName: %s, domain: %s, ip: %s", hostName, domain, ipv4address)
 	b, err := readFile(file)
 	if err != nil {
 		return err
 	}
 	hostsFile := string(b)
 	log.Printf("[updateHostsFile] original hosts file: %s", hostsFile)
 
-	ipv4HostString := ip + " " + hostName + domain + " " + hostName
+	ipv4HostString := ipv4address + " " + hostName + domain + " " + hostName
 	log.Printf("[updateHostsFile] ipv4HostString: %s", ipv4HostString)
 
 	lines := strings.Split(hostsFile, "\n")
 	var filteredLines = make([]string, 0)
 	for _, line := range lines {
-		if !strings.Contains(line, ip) {
+		if !strings.Contains(line, ipv4address) {
 			filteredLines = append(filteredLines, line)
 		}
 	}

saltboot/hostname_test.go

@@ -18,10 +18,6 @@ func init() {
 }
 
 func TestHostsFileWriteRemoveExistingIp(t *testing.T) {
-	getIpv4Address := func() (string, error) {
-		return "10.0.0.1", nil
-	}
-
 	readFile = func(filename string) ([]byte, error) {
 		hostsFile := `
 127.0.0.1	localhost
@@ -43,7 +39,7 @@ func TestHostsFileWriteRemoveExistingIp(t *testing.T) {
 		writeFile = emptyWriteFile
 	}()
 
-	updateHostsFile("hostname-1", ".example.com", "hosts", getIpv4Address)
+	updateHostsFile("hostname-1", ".example.com", "hosts", "10.0.0.1")
 
 	expected := `
 127.0.0.1	localhost
@@ -57,10 +53,6 @@ func TestHostsFileWriteRemoveExistingIp(t *testing.T) {
 }
 
 func TestHostsFileWriteRemoveExistingIpNotLastLine(t *testing.T) {
-	getIpv4Address := func() (string, error) {
-		return "10.0.0.1", nil
-	}
-
 	readFile = func(filename string) ([]byte, error) {
 		hostsFile := `
 127.0.0.1	localhost
@@ -83,7 +75,7 @@ func TestHostsFileWriteRemoveExistingIpNotLastLine(t *testing.T) {
 		writeFile = emptyWriteFile
 	}()
 
-	updateHostsFile("hostname-1", ".example.com", "hosts", getIpv4Address)
+	updateHostsFile("hostname-1", ".example.com", "hosts", "10.0.0.1")
 
 	expected := `
 127.0.0.1	localhost
@@ -98,10 +90,6 @@ func TestHostsFileWriteRemoveExistingIpNotLastLine(t *testing.T) {
 }
 
 func TestHostsFileWriteRemoveExistingIpMiddleLastLine(t *testing.T) {
-	getIpv4Address := func() (string, error) {
-		return "10.0.0.1", nil
-	}
-
 	readFile = func(filename string) ([]byte, error) {
 		hostsFile := `
 127.0.0.1	localhost
@@ -125,7 +113,7 @@ func TestHostsFileWriteRemoveExistingIpMiddleLastLine(t *testing.T) {
 		writeFile = emptyWriteFile
 	}()
 
-	updateHostsFile("hostname-1", ".example.com", "hosts", getIpv4Address)
+	updateHostsFile("hostname-1", ".example.com", "hosts", "10.0.0.1")
 
 	expected := `
 127.0.0.1	localhost
@@ -141,10 +129,6 @@ func TestHostsFileWriteRemoveExistingIpMiddleLastLine(t *testing.T) {
 }
 
 func TestHostsFileWriteIpNotPresent(t *testing.T) {
-	getIpv4Address := func() (string, error) {
-		return "10.0.0.1", nil
-	}
-
 	readFile = func(filename string) ([]byte, error) {
 		hostsFile := `
 127.0.0.1	localhost
@@ -167,7 +151,7 @@ func TestHostsFileWriteIpNotPresent(t *testing.T) {
 		writeFile = emptyWriteFile
 	}()
 
-	updateHostsFile("hostname-1", ".example.com", "hosts", getIpv4Address)
+	updateHostsFile("hostname-1", ".example.com", "hosts", "10.0.0.1")
 
 	expected := `
 127.0.0.1	localhost
@@ -183,10 +167,6 @@ func TestHostsFileWriteIpNotPresent(t *testing.T) {
 }
 
 func TestHostsFileWriteExistingWithDefaultDomain(t *testing.T) {
-	getIpv4Address := func() (string, error) {
-		return "10.0.0.1", nil
-	}
-
 	readFile = func(filename string) ([]byte, error) {
 		hostsFile := `
 127.0.0.1	localhost
@@ -210,7 +190,7 @@ func TestHostsFileWriteExistingWithDefaultDomain(t *testing.T) {
 		writeFile = emptyWriteFile
 	}()
 
-	updateHostsFile("hostname-1", ".compute.internal", "hosts", getIpv4Address)
+	updateHostsFile("hostname-1", ".compute.internal", "hosts", "10.0.0.1")
 
 	expected := `
 127.0.0.1	localhost

saltboot/salt.go

@@ -133,7 +133,7 @@ func SaltMinionRunRequestHandler(w http.ResponseWriter, req *http.Request) {
 		saltMinion.Domain = saltActionRequest.Master.Domain
 	}
 
-	err = ensureHostIsResolvable(saltMinion.Hostname, saltMinion.Domain)
+	err = ensureHostIsResolvable(saltMinion.Hostname, saltMinion.Domain, saltMinion.Address)
 	if err != nil {
 		log.Printf("[SaltMinionRunRequestHandler] [ERROR] while hostfile update: %s", err.Error())
 	}
@@ -227,7 +227,7 @@ func SaltServerRunRequestHandler(w http.ResponseWriter, req *http.Request) {
 		saltMaster = saltActionRequest.Master
 	}
 
-	if err := ensureHostIsResolvable(saltMaster.Hostname, saltMaster.Domain); err != nil {
+	if err := ensureHostIsResolvable(saltMaster.Hostname, saltMaster.Domain, saltMaster.Address); err != nil {
 		log.Printf("[SaltServerRunRequestHandler] [ERROR] while hostfile update: %s", err.Error())
 	}
 

saltboot/salt_test.go

@@ -111,7 +111,6 @@ func TestSaltMinionRunRequestHandler(t *testing.T) {
 	checkExecutedCommands([]string{
 		"hostname -s",
 		"hostname -d",
-		"hostname -I",
 		"hostname ",
 		"grep SUSE /etc/issue",
 		"ps aux",
@@ -165,7 +164,6 @@ func TestSaltServerRunRequestHandler(t *testing.T) {
 	checkExecutedCommands([]string{
 		"hostname -s",
 		"hostname -d",
-		"hostname -I",
 		"hostname ",
 		"grep SUSE /etc/issue",
 		"grep saltuser /etc/passwd",