Merge pull request #5910 from grayaii/master

Elasticsearch times out. It takes a while to create.
This commit is contained in:
James Nugent 2016-03-30 17:22:06 -07:00
commit 980f165bf7
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) d.SetId(*out.DomainStatus.ARN)
log.Printf("[DEBUG] Waiting for ElasticSearch domain %q to be created", d.Id()) log.Printf("[DEBUG] Waiting for ElasticSearch domain %q to be created", d.Id())
err = resource.Retry(15*time.Minute, func() *resource.RetryError { err = resource.Retry(30*time.Minute, func() *resource.RetryError {
out, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{ out, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)), DomainName: aws.String(d.Get("domain_name").(string)),
}) })
@ -367,7 +367,7 @@ func resourceAwsElasticSearchDomainUpdate(d *schema.ResourceData, meta interface
return err return err
} }
err = resource.Retry(25*time.Minute, func() *resource.RetryError { err = resource.Retry(50*time.Minute, func() *resource.RetryError {
out, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{ out, err := conn.DescribeElasticsearchDomain(&elasticsearch.DescribeElasticsearchDomainInput{
DomainName: aws.String(d.Get("domain_name").(string)), DomainName: aws.String(d.Get("domain_name").(string)),
}) })