From 3894ec9bae53d37744c2933c9b841982361a675b Mon Sep 17 00:00:00 2001 From: Nic Palmer Date: Wed, 21 Dec 2016 15:48:07 +0000 Subject: [PATCH] Fixed eu-west-2 entries for discovery-ec2 and repository-s3 also updated the asciidocs --- docs/plugins/discovery-ec2.asciidoc | 1 + docs/plugins/repository-s3.asciidoc | 1 + .../java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java | 2 +- .../java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java | 3 +++ 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/plugins/discovery-ec2.asciidoc b/docs/plugins/discovery-ec2.asciidoc index 26d4f321899..861a6da575b 100644 --- a/docs/plugins/discovery-ec2.asciidoc +++ b/docs/plugins/discovery-ec2.asciidoc @@ -120,6 +120,7 @@ The available values are: * `ap-northeast` (`ap-northeast-1`) for Asia Pacific (Tokyo) * `ap-northeast-2` (`ap-northeast-2`) for Asia Pacific (Seoul) * `eu-west` (`eu-west-1`) for EU (Ireland) +* `eu-west-2` (`eu-west-2`) for EU (London) * `eu-central` (`eu-central-1`) for EU (Frankfurt) * `sa-east` (`sa-east-1`) for South America (São Paulo) * `cn-north` (`cn-north-1`) for China (Beijing) diff --git a/docs/plugins/repository-s3.asciidoc b/docs/plugins/repository-s3.asciidoc index fcac3105930..351d1daeca8 100644 --- a/docs/plugins/repository-s3.asciidoc +++ b/docs/plugins/repository-s3.asciidoc @@ -125,6 +125,7 @@ The available values are: * `ap-northeast` (`ap-northeast-1`) for Asia Pacific (Tokyo) * `ap-northeast-2` (`ap-northeast-2`) for Asia Pacific (Seoul) * `eu-west` (`eu-west-1`) for EU (Ireland) +* `eu-west-2` (`eu-west-2`) for EU (London) * `eu-central` (`eu-central-1`) for EU (Frankfurt) * `sa-east` (`sa-east-1`) for South America (São Paulo) * `cn-north` (`cn-north-1`) for China (Beijing) diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java index f8dec51f41a..fb76967914d 100644 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java @@ -210,4 +210,4 @@ public class AwsEc2ServiceImpl extends AbstractComponent implements AwsEc2Servic // Ensure that IdleConnectionReaper is shutdown IdleConnectionReaper.shutdown(); } -} +} \ No newline at end of file diff --git a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java b/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java index 25a8ab403d7..065d571dc35 100644 --- a/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java +++ b/plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java @@ -202,6 +202,9 @@ public class InternalAwsS3Service extends AbstractLifecycleComponent implements case "eu-west-1": endpoint = "s3-eu-west-1.amazonaws.com"; break; + case "eu-west-2": + endpoint = "s3-eu-west-2.amazonaws.com"; + break; case "eu-central": case "eu-central-1": endpoint = "s3.eu-central-1.amazonaws.com";