Skip to content

Commit

Permalink
Merge 6e4ddaf into 0d96fc4
Browse files Browse the repository at this point in the history
  • Loading branch information
ericfode committed Nov 5, 2014
2 parents 0d96fc4 + 6e4ddaf commit c98c99d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ Installs and configures [Consul][1].
attribute to the IP of the specified interface if it exists.
</td>
<td><tt>nil</tt></td>
</tr>
</tr>
<tr>
<td><tt>['consul']['advertise_interface']</tt></td>
<td>String</td>
Expand All @@ -162,6 +162,15 @@ Installs and configures [Consul][1].
</td>
<td><tt>nil</tt></td>
</tr>
<tr>
<td><tt>['consul']['extra_params']</tt></td>
<td>Hash</td>
<td>
Any extra params to be put in the agent options
http://www.consul.io/docs/agent/options.html
</td>
<td><tt>{}</tt></td>
</tr>
</table>

### Consul UI Attributes
Expand Down
1 change: 1 addition & 0 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,4 @@
default['consul']['client_addr'] = '0.0.0.0'
default['consul']['ui_dir'] = '/var/lib/consul/ui'
default['consul']['serve_ui'] = false
default['consul']['extra_params'] = {}
2 changes: 1 addition & 1 deletion recipes/_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
end

# Determine service params
service_config = {}
service_config = node['consul']['extra_params']
service_config['data_dir'] = node['consul']['data_dir']
num_cluster = node['consul']['bootstrap_expect'].to_i

Expand Down

0 comments on commit c98c99d

Please sign in to comment.