Merge pull request #6933 from cb-oath/openstack-v2-network-optional

openstack: Make the config.networkV2Client conditional in StepAllocateIp

builder/openstack/step_allocate_ip.go

@@ -21,6 +21,17 @@ func (s *StepAllocateIp) Run(_ context.Context, state multistep.StateBag) multis
 	config := state.Get("config").(*Config)
 	server := state.Get("server").(*servers.Server)
 
+	var instanceIP floatingips.FloatingIP
+
+	// This is here in case we error out before putting instanceIp into the
+	// statebag below, because it is requested by Cleanup()
+	state.Put("access_ip", &instanceIP)
+
+	if s.FloatingIP == "" && !s.ReuseIPs && s.FloatingIPNetwork == "" {
+		ui.Message("Floating IP not required")
+		return multistep.ActionContinue
+	}
+
 	// We need the v2 compute client
 	computeClient, err := config.computeV2Client()
 	if err != nil {
@@ -37,12 +48,6 @@ func (s *StepAllocateIp) Run(_ context.Context, state multistep.StateBag) multis
 		return multistep.ActionHalt
 	}
 
-	var instanceIP floatingips.FloatingIP
-
-	// This is here in case we error out before putting instanceIp into the
-	// statebag below, because it is requested by Cleanup()
-	state.Put("access_ip", &instanceIP)
-
 	// Try to Use the OpenStack floating IP by checking provided parameters in
 	// the following order:
 	//  - try to use "FloatingIP" ID directly if it's provided
@@ -142,6 +147,11 @@ func (s *StepAllocateIp) Cleanup(state multistep.StateBag) {
 	ui := state.Get("ui").(packer.Ui)
 	instanceIP := state.Get("access_ip").(*floatingips.FloatingIP)
 
+	// Don't clean up if unless required
+	if instanceIP.ID == "" && instanceIP.FloatingIP == "" {
+		return
+	}
+
 	// Don't delete pool addresses we didn't allocate
 	if state.Get("floatingip_istemp") == false {
 		return