honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-03 01:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support ap-northeast region for EC2 and S3

Browse Source 
Closes #52.
This commit is contained in:
Kenta Suzuki 2014-02-05 14:41:48 +09:00 committed by David Pilato
parent 3616ed6ddd
commit 4c7e384c96
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -40,7 +40,18 @@ The plugin will automatically use the instance level security credentials (as of
### Region
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: `us-east` (`us-east-1`), `us-west` (`us-west-1`), `us-west-1`, `us-west-2` `ap-southeast` (`ap-southeast-1`), `ap-southeast-1`, `ap-southeast-2`, `ap-northeast` (`ap-northeast-1`) `eu-west` (`eu-west-1`), `sa-east` (`sa-east-1`).
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:
* `us-east` (`us-east-1`)
* `us-west` (`us-west-1`)
* `us-west-1`
* `us-west-2`
* `ap-southeast` (`ap-southeast-1`)
* `ap-southeast-1`
* `ap-southeast-2`
* `ap-northeast` (`ap-northeast-1`)
* `eu-west` (`eu-west-1`)
* `sa-east` (`sa-east-1`).
## EC2 Discovery

4
src/main/java/org/elasticsearch/gateway/s3/S3Gateway.java
View File

@ -76,6 +76,10 @@ public class S3Gateway extends BlobStoreGateway {
region = "ap-southeast-1";
} else if ("ap-southeast-2".equals(regionSetting.toLowerCase())) {
region = "ap-southeast-2";
} else if ("ap-northeast".equals(regionSetting.toLowerCase())) {
region = "ap-northeast-1";
} else if ("ap-northeast-1".equals(regionSetting.toLowerCase())) {
region = "ap-northeast-1";
} else if ("eu-west".equals(regionSetting.toLowerCase())) {
region = "EU";
} else if ("eu-west-1".equals(regionSetting.toLowerCase())) {

4
src/main/java/org/elasticsearch/repositories/s3/S3Repository.java
View File

@ -105,6 +105,10 @@ public class S3Repository extends BlobStoreRepository {
region = "ap-southeast-1";
} else if ("ap-southeast-2".equals(regionSetting)) {
region = "ap-southeast-2";
} else if ("ap-northeast".equals(regionSetting)) {
region = "ap-northeast-1";
} else if ("ap-northeast-1".equals(regionSetting)) {
region = "ap-northeast-1";
} else if ("eu-west".equals(regionSetting)) {
region = "EU";
} else if ("eu-west-1".equals(regionSetting)) {