honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pr/19110-aws-mumbai'

This commit is contained in:
David Pilato 2016-06-28 10:01:14 +02:00
parent ab8ff8909b af989c0780
commit 18d45b2d5c
4 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
docs/plugins/discovery-ec2.asciidoc
View File

@ -105,19 +105,18 @@ cloud:
The `cloud.aws.region` can be set to a region and will automatically use the relevant settings for both `ec2` and `s3`. The `cloud.aws.region` can be set to a region and will automatically use the relevant settings for both `ec2` and `s3`.
The available values are: The available values are:
* `us-east` (`us-east-1`) * `us-east` (`us-east-1`) for US East (N. Virginia)
* `us-west` (`us-west-1`) * `us-west` (`us-west-1`) for US West (N. California)
* `us-west-1` * `us-west-2` for US West (Oregon)
* `us-west-2` * `ap-south-1` for Asia Pacific (Mumbai)
* `ap-southeast` (`ap-southeast-1`) * `ap-southeast` (`ap-southeast-1`) for Asia Pacific (Singapore)
* `ap-southeast-1` * `ap-southeast-2` for Asia Pacific (Sydney)
* `ap-southeast-2` * `ap-northeast` (`ap-northeast-1`) for Asia Pacific (Tokyo)
* `ap-northeast` (`ap-northeast-1`) * `ap-northeast-2` (`ap-northeast-2`) for Asia Pacific (Seoul)
* `ap-northeast-2` (`ap-northeast-2`) * `eu-west` (`eu-west-1`) for EU (Ireland)
* `eu-west` (`eu-west-1`) * `eu-central` (`eu-central-1`) for EU (Frankfurt)
* `eu-central` (`eu-central-1`) * `sa-east` (`sa-east-1`) for South America (São Paulo)
* `sa-east` (`sa-east-1`) * `cn-north` (`cn-north-1`) for China (Beijing)
* `cn-north` (`cn-north-1`)
[[discovery-ec2-usage-signer]] [[discovery-ec2-usage-signer]]
===== EC2 Signer API ===== EC2 Signer API

25
docs/plugins/repository-s3.asciidoc
View File

@ -110,19 +110,18 @@ The `cloud.aws.region` can be set to a region and will automatically use the rel
You can specifically set it for s3 only using `cloud.aws.s3.region`. You can specifically set it for s3 only using `cloud.aws.s3.region`.
The available values are: The available values are:
* `us-east` (`us-east-1`) * `us-east` (`us-east-1`) for US East (N. Virginia)
* `us-west` (`us-west-1`) * `us-west` (`us-west-1`) for US West (N. California)
* `us-west-1` * `us-west-2` for US West (Oregon)
* `us-west-2` * `ap-south-1` for Asia Pacific (Mumbai)
* `ap-southeast` (`ap-southeast-1`) * `ap-southeast` (`ap-southeast-1`) for Asia Pacific (Singapore)
* `ap-southeast-1` * `ap-southeast-2` for Asia Pacific (Sydney)
* `ap-southeast-2` * `ap-northeast` (`ap-northeast-1`) for Asia Pacific (Tokyo)
* `ap-northeast` (`ap-northeast-1`) * `ap-northeast-2` (`ap-northeast-2`) for Asia Pacific (Seoul)
* `ap-northeast-2` (`ap-northeast-2`) * `eu-west` (`eu-west-1`) for EU (Ireland)
* `eu-west` (`eu-west-1`) * `eu-central` (`eu-central-1`) for EU (Frankfurt)
* `eu-central` (`eu-central-1`) * `sa-east` (`sa-east-1`) for South America (São Paulo)
* `sa-east` (`sa-east-1`) * `cn-north` (`cn-north-1`) for China (Beijing)
* `cn-north` (`cn-north-1`)
[[repository-s3-usage-signer]] [[repository-s3-usage-signer]]
===== S3 Signer API ===== S3 Signer API

2
plugins/discovery-ec2/src/main/java/org/elasticsearch/cloud/aws/AwsEc2ServiceImpl.java
View File

@ -148,6 +148,8 @@ public class AwsEc2ServiceImpl extends AbstractLifecycleComponent<AwsEc2Service>
endpoint = "ec2.ap-southeast-1.amazonaws.com"; endpoint = "ec2.ap-southeast-1.amazonaws.com";
} else if (region.equals("us-gov-west") || region.equals("us-gov-west-1")) { } else if (region.equals("us-gov-west") || region.equals("us-gov-west-1")) {
endpoint = "ec2.us-gov-west-1.amazonaws.com"; endpoint = "ec2.us-gov-west-1.amazonaws.com";
} else if (region.equals("ap-south-1")) {
endpoint = "ec2.ap-south-1.amazonaws.com";
} else if (region.equals("ap-southeast-2")) { } else if (region.equals("ap-southeast-2")) {
endpoint = "ec2.ap-southeast-2.amazonaws.com"; endpoint = "ec2.ap-southeast-2.amazonaws.com";
} else if (region.equals("ap-northeast") || region.equals("ap-northeast-1")) { } else if (region.equals("ap-northeast") || region.equals("ap-northeast-1")) {

2
plugins/repository-s3/src/main/java/org/elasticsearch/cloud/aws/InternalAwsS3Service.java
View File

@ -155,6 +155,8 @@ public class InternalAwsS3Service extends AbstractLifecycleComponent<AwsS3Servic
return "s3-us-west-1.amazonaws.com"; return "s3-us-west-1.amazonaws.com";
} else if ("us-west-2".equals(region)) { } else if ("us-west-2".equals(region)) {
return "s3-us-west-2.amazonaws.com"; return "s3-us-west-2.amazonaws.com";
} else if (region.equals("ap-south-1")) {
return "s3-ap-south-1.amazonaws.com";
} else if ("ap-southeast".equals(region) || "ap-southeast-1".equals(region)) { } else if ("ap-southeast".equals(region) || "ap-southeast-1".equals(region)) {
return "s3-ap-southeast-1.amazonaws.com"; return "s3-ap-southeast-1.amazonaws.com";
} else if ("ap-southeast-2".equals(region)) { } else if ("ap-southeast-2".equals(region)) {