Merge branch '0.3'

Author: Tamas Bihari

Makefile

@@ -1,6 +1,6 @@
 BINARY=salt-bootstrap
 
-VERSION=0.10.2
+VERSION=0.10.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/client.go

@@ -35,7 +35,7 @@ func (clients *Clients) DistributeHostnameRequest(user string, pass string) (res
 
 func ClientHostnameHandler(w http.ResponseWriter, req *http.Request) {
 	log.Printf("[ClientHostnameHandler] get FQDN")
-	fqdn, err := getHostName()
+	fqdn, err := getFQDN()
 	if err != nil {
 		log.Printf("[ClientHostnameHandler] failed to retrieve FQDN")
 		model.Response{Status: err.Error(), StatusCode: http.StatusInternalServerError}.WriteHttp(w)

saltboot/hostname.go

@@ -13,31 +13,36 @@ func getIpv4Address() (string, error) {
 	return ExecCmd("hostname", "-i")
 }
 
-func getHostName() (string, error) {
+func getFQDN() (string, error) {
 	return ExecCmd("hostname", "-f")
 }
 
+func getHostName() (string, error) {
+	return ExecCmd("hostname", "-s")
+}
+
+func getDomain() (string, error) {
+	return ExecCmd("hostname", "-d")
+}
+
 // This is required due to: https://github.com/saltstack/salt/issues/32719
-func ensureIpv6Resolvable(domain string) error {
-	fqdn, err := getHostName()
-	log.Printf("[ensureIpv6Resolvable] fqdn: %s", fqdn)
-	if err != nil {
-		return err
+func ensureIpv6Resolvable(customDomain string) error {
+	hostname, hostNameErr := getHostName()
+	log.Printf("[ensureIpv6Resolvable] hostName: %s", hostname)
+	if hostNameErr != nil {
+		return hostNameErr
 	}
-	if !strings.Contains(fqdn, ".") {
-		// only fqdn does not contain domain
-		if domain != "" {
-			updateIpv6HostName(fqdn, domain)
-		} else {
-			//if there is no domain, we need to add one since ambari fails without domain, actually it does nothing just hangs..
-			updateIpv6HostName(fqdn, DEFAULT_DOMAIN)
+
+	domain, domainError := getDomain()
+	log.Printf("[ensureIpv6Resolvable] origin domain: %s", domain)
+	if customDomain == "" {
+		if domainError != nil || domain == "" {
+			domain = DEFAULT_DOMAIN
 		}
 	} else {
-		if domain != "" {
-			hostName := strings.Split(fqdn, ".")[0]
-			updateIpv6HostName(hostName, domain)
-		}
+		domain = customDomain
 	}
+	updateIpv6HostName(hostname, domain)
 
 	return nil
 }

saltboot/salt_test.go

@@ -151,7 +151,7 @@ func TestSaltServerRunRequestHandler(t *testing.T) {
 
 	SaltServerRunRequestHandler(w, req)
 
-	pattern := "^hostname -f:hostname -i:grep saltuser /etc/passwd:adduser --no-create-home -G wheel -s /sbin/nologin --password \\$6\\$([a-zA-Z\\$0-9/.]+) saltuser:ps aux:/sbin/service salt-master start:/sbin/chkconfig salt-master on:ps aux:/sbin/service salt-api start:/sbin/chkconfig salt-api on:$"
+	pattern := "^hostname -s:hostname -d:hostname -i:grep saltuser /etc/passwd:adduser --no-create-home -G wheel -s /sbin/nologin --password \\$6\\$([a-zA-Z\\$0-9/.]+) saltuser:ps aux:/sbin/service salt-master start:/sbin/chkconfig salt-master on:ps aux:/sbin/service salt-api start:/sbin/chkconfig salt-api on:$"
 	if m, err := regexp.MatchString(pattern, os.Getenv(EXECUTED_COMMANDS)); m == false || err != nil {
 		t.Errorf("wrong commands were executed: %s", os.Getenv(EXECUTED_COMMANDS))
 	}