Merge pull request #44 from rackn/machine-timeout

Add support for timeouts on the machine resource.
rackn · Jun 13, 2018 · b8dc0cd · b8dc0cd
2 parents 01f6986 + e8184d3
commit b8dc0cd
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/drp/resource_drp_machine.go b/drp/resource_drp_machine.go
@@ -53,6 +53,12 @@ func resourceMachine() *schema.Resource {
 	r.Update = resourceMachineUpdate
 	r.Delete = resourceMachineDelete
 
+	r.Timeouts = &schema.ResourceTimeout{
+		Create: schema.DefaultTimeout(25 * time.Minute),
+		Update: schema.DefaultTimeout(10 * time.Minute),
+		Delete: schema.DefaultTimeout(10 * time.Minute),
+	}
+
 	// Define what the machines completion stage.
 	r.Schema["completion_stage"] = &schema.Schema{
 		Type:     schema.TypeString,
@@ -325,7 +331,7 @@ func resourceMachineCreate(d *schema.ResourceData, meta interface{}) error {
 		Pending:    []string{"9:"},
 		Target:     []string{"6:"},
 		Refresh:    getMachineStatus(cc, machineObj.UUID(), stages),
-		Timeout:    25 * time.Minute,
+		Timeout:    d.Timeout(schema.TimeoutCreate),
 		Delay:      10 * time.Second,
 		MinTimeout: 3 * time.Second,
 	}