From 6e0b445abbcd9e717b9f8683203a6917fb6ad7bd Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Fri, 7 Apr 2017 14:07:59 -0700 Subject: [PATCH] Add registration of new discovery settings This was forgotten as part of #23961 --- .../elasticsearch/discovery/ec2/Ec2DiscoveryPlugin.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPlugin.java b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPlugin.java index d78197e875b..5c091b825a4 100644 --- a/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPlugin.java +++ b/plugins/discovery-ec2/src/main/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryPlugin.java @@ -143,6 +143,15 @@ public class Ec2DiscoveryPlugin extends Plugin implements DiscoveryPlugin, Close AwsEc2Service.CLOUD_EC2.ENDPOINT_SETTING, AwsEc2Service.CLOUD_EC2.READ_TIMEOUT, // Register EC2 discovery settings: discovery.ec2 + AwsEc2Service.DISCOVERY_EC2.ACCESS_KEY_SETTING, + AwsEc2Service.DISCOVERY_EC2.SECRET_KEY_SETTING, + AwsEc2Service.DISCOVERY_EC2.ENDPOINT_SETTING, + AwsEc2Service.DISCOVERY_EC2.PROTOCOL_SETTING, + AwsEc2Service.DISCOVERY_EC2.PROXY_HOST_SETTING, + AwsEc2Service.DISCOVERY_EC2.PROXY_PORT_SETTING, + AwsEc2Service.DISCOVERY_EC2.PROXY_USERNAME_SETTING, + AwsEc2Service.DISCOVERY_EC2.PROXY_PASSWORD_SETTING, + AwsEc2Service.DISCOVERY_EC2.READ_TIMEOUT_SETTING, AwsEc2Service.DISCOVERY_EC2.HOST_TYPE_SETTING, AwsEc2Service.DISCOVERY_EC2.ANY_GROUP_SETTING, AwsEc2Service.DISCOVERY_EC2.GROUPS_SETTING,