Move IP address listener outside interruptible wait

This commit moves the goroutine used to listen for IP address changes.
It has been moved outside the interruptible wait, since the goroutine
should only be fired once.

Moving the goroutine outside the interruptible wait renders the
"isRunning" property unnecessary. This property was introduced in

bf1cc1d (Add support for IP address changes, 2023-04-08)

Author: Erik142

builder/xenserver/common/step_wait_for_ip.go

@@ -11,9 +11,8 @@ import (
 
 type StepWaitForIP struct {
 	VmCleanup
-	Chan      <-chan string
-	Timeout   time.Duration
-	isRunning bool
+	Chan    <-chan string
+	Timeout time.Duration
 }
 
 func (self *StepWaitForIP) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
@@ -30,62 +29,57 @@ func (self *StepWaitForIP) Run(ctx context.Context, state multistep.StateBag) mu
 		return multistep.ActionHalt
 	}
 
-	var ip string
-	err = InterruptibleWait{
-		Timeout:           self.Timeout,
-		PredicateInterval: 5 * time.Second,
-		Predicate: func() (result bool, err error) {
-			if !self.isRunning {
-				go func(c Connection, ui packer.Ui, config CommonConfig) {
-					self.isRunning = true
-					state.Put("instance_ssh_address", "")
-					var ip string
-
-					for true {
-						time.Sleep(500 * time.Millisecond)
-						if config.IPGetter == "auto" || config.IPGetter == "http" {
-							// Snoop IP from HTTP fetch
-							select {
-							case temp_ip := <-self.Chan:
-								if ip != temp_ip {
-									ip = temp_ip
-									ui.Message(fmt.Sprintf("Got IP '%s' from HTTP request", ip))
-									state.Put("instance_ssh_address", ip)
-								}
-							default:
-							}
-						}
-
-						if config.IPGetter == "auto" || config.IPGetter == "tools" {
-							// Look for PV IP
-							m, err := c.client.VM.GetGuestMetrics(c.session, instance)
-							if err != nil {
-								continue
-							}
-							if m != "" {
-								metrics, err := c.client.VMGuestMetrics.GetRecord(c.session, m)
-								if err != nil {
-									continue
-								}
-								networks := metrics.Networks
-								if temp_ip, ok := networks["0/ip"]; ok {
-									if temp_ip != "" && ip != temp_ip {
-										ip = temp_ip
-										ui.Message(fmt.Sprintf("Got IP '%s' from XenServer tools", ip))
-										state.Put("instance_ssh_address", ip)
-									}
-								}
-							}
+	go func(c Connection, ui packer.Ui, config CommonConfig) {
+		state.Put("instance_ssh_address", "")
+		var ip string
+
+		for true {
+			time.Sleep(500 * time.Millisecond)
+			if config.IPGetter == "auto" || config.IPGetter == "http" {
+				// Snoop IP from HTTP fetch
+				select {
+				case temp_ip := <-self.Chan:
+					if ip != temp_ip {
+						ip = temp_ip
+						ui.Message(fmt.Sprintf("Got IP '%s' from HTTP request", ip))
+						state.Put("instance_ssh_address", ip)
+					}
+				default:
+				}
+			}
 
+			if config.IPGetter == "auto" || config.IPGetter == "tools" {
+				// Look for PV IP
+				m, err := c.client.VM.GetGuestMetrics(c.session, instance)
+				if err != nil {
+					continue
+				}
+				if m != "" {
+					metrics, err := c.client.VMGuestMetrics.GetRecord(c.session, m)
+					if err != nil {
+						continue
+					}
+					networks := metrics.Networks
+					if temp_ip, ok := networks["0/ip"]; ok {
+						if temp_ip != "" && ip != temp_ip {
+							ip = temp_ip
+							ui.Message(fmt.Sprintf("Got IP '%s' from XenServer tools", ip))
+							state.Put("instance_ssh_address", ip)
 						}
 					}
+				}
 
-					self.isRunning = false
-				}(*c, ui, config)
-
-				time.Sleep(500 * time.Millisecond)
 			}
+		}
+	}(*c, ui, config)
 
+	time.Sleep(500 * time.Millisecond)
+
+	var ip string
+	err = InterruptibleWait{
+		Timeout:           self.Timeout,
+		PredicateInterval: 5 * time.Second,
+		Predicate: func() (result bool, err error) {
 			if ip = state.Get("instance_ssh_address").(string); ip != "" {
 				return true, nil
 			}