provider/aws: Allow Instance to be computed in EIPs

2015-08-20 10:32:34 -05:00 · 2015-08-20 10:32:34 -05:00 · c68d9c4ae0
parent 877f9f85f0
commit c68d9c4ae0
1 changed files with 4 additions and 4 deletions
--- a/builtin/providers/aws/resource_aws_eip.go
+++ b/builtin/providers/aws/resource_aws_eip.go
@ -30,13 +30,13 @@ func resourceAwsEip() *schema.Resource {
 			"instance": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+                                Computed: true,
 			},

 			"network_interface": &schema.Schema{
-				Type:          schema.TypeString,
-				Optional:      true,
-				Computed:      true,
-				ConflictsWith: []string{"instance"},
+                                Type:     schema.TypeString,
+                                Optional: true,
+                                Computed: true,
 			},

 			"allocation_id": &schema.Schema{