Allow setting AWS region and endpoint settings in node attributes

Closes #33.
sous-chefs · Dec 12, 2012 · 24bc9cc · 24bc9cc
1 parent bfd5881
commit 24bc9cc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/attributes/aws.rb b/attributes/aws.rb
@@ -17,3 +17,5 @@
 default.elasticsearch[:cloud][:ec2][:security_group] = ( aws['cloud']['ec2']['security_group'] rescue nil )
 default.elasticsearch[:cloud][:aws][:access_key]     = ( aws['cloud']['aws']['access_key']     rescue nil )
 default.elasticsearch[:cloud][:aws][:secret_key]     = ( aws['cloud']['aws']['secret_key']     rescue nil )
+default.elasticsearch[:cloud][:aws][:region]         = ( aws['cloud']['aws']['region']         rescue nil )
+default.elasticsearch[:cloud][:ec2][:endpoint]       = ( aws['cloud']['ec2']['endpoint']       rescue nil )
diff --git a/templates/default/elasticsearch.yml.erb b/templates/default/elasticsearch.yml.erb
@@ -37,6 +37,12 @@ cloud.node.auto_attributes: true
 cloud.aws.access_key: '<%= node.elasticsearch[:cloud][:aws][:access_key] %>'
 cloud.aws.secret_key: '<%= node.elasticsearch[:cloud][:aws][:secret_key] %>'
 <% end %>
+<% if node.elasticsearch[:cloud][:aws][:region] %>
+cloud.aws.region: '<%= node.elasticsearch[:cloud][:aws][:region] %>'
+<% end %>
+<% if node.elasticsearch[:cloud][:ec2][:endpoint] %>
+cloud.aws.ec2.endpoint: '<%= node.elasticsearch[:cloud][:ec2][:endpoint] %>'
+<% end %>
 
 <% if node.elasticsearch[:gateway][:type] %>
 ################################## Persistence ##################################