Merge pull request #7944 from grayaii/master

Increase timeout yet again for aws elasticsearch resource
This commit is contained in:
James Nugent 2016-08-03 07:49:31 -07:00 committed by GitHub
commit 5320a54831
1 changed files with 2 additions and 2 deletions

View File

@ -207,7 +207,7 @@ func resourceAwsElasticSearchDomainCreate(d *schema.ResourceData, meta interface
d.SetId(*out.DomainStatus.ARN)
log.Printf("[DEBUG] Waiting for ElasticSearch domain %q to be created", d.Id())
err = resource.Retry(30*time.Minute, func() *resource.RetryError {
err = resource.Retry(60*time.Minute, func() *resource.RetryError {
out, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)),
})
@ -403,7 +403,7 @@ func resourceAwsElasticSearchDomainDelete(d *schema.ResourceData, meta interface
}
log.Printf("[DEBUG] Waiting for ElasticSearch domain %q to be deleted", d.Get("domain_name").(string))
err = resource.Retry(30*time.Minute, func() *resource.RetryError {
err = resource.Retry(60*time.Minute, func() *resource.RetryError {
out, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)),
})