Skip to content

Commit

Permalink
Merge pull request #42 from johntdyer/master
Browse files Browse the repository at this point in the history
Update for 0.4.0
  • Loading branch information
reset committed Sep 15, 2014
2 parents 1f5f74a + 0b1998f commit a7cd8b3
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 4 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# 0.4.2
Bumps default version of Consul to 0.4.0

# 0.4.1
Bumps default version of Consul to 0.3.1.

Expand Down
25 changes: 25 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,31 @@ Include `consul::ui` in your node's `run_list`:
}
```

### LWRP

#### Adding service without check
consul_service "voice1" do
port 5060
tags: ["_sip._udp"]
end

#### Adding service with check

consul_service "voice1" do
port 5060
tags: ["_sip._udp"]
check (
interval: '10s',
script: 'echo ok'
)
end

#### Removing service

consul_service "voice1" do
action :delete
end

## Authors

Created and maintained by [John Bellone][3] [@johnbellone][2] (<[email protected]>) and a growing community of [contributors][4].
Expand Down
9 changes: 7 additions & 2 deletions attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#

default['consul']['base_url'] = 'https://dl.bintray.com/mitchellh/consul/'
default['consul']['version'] = '0.3.1'
default['consul']['version'] = '0.4.0'
default['consul']['install_method'] = 'binary'
default['consul']['install_dir'] = '/usr/local/bin'
default['consul']['checksums'] = {
Expand All @@ -29,7 +29,12 @@
'0.3.1_linux_386' => '9b8340fdf464a99fc9dc108115602c761b703a16277fbd9f4f164123cf2a9f11',
'0.3.1_linux_amd64' => 'c33da8ac24f01eefe8549e8d4d301b4e18a71b61f06ae1377a88ccd6eab2cfbb',
'0.3.1_web_ui' => 'd8982803fffb84d3202260161f6310bd6bddb5b12bf690cf00210cd659a31ddd',
'0.3.1_windows_386' => '102bda6e02b193a9417e80795875bf7d18259fc5daff3d048d274beef690eb26'
'0.3.1_windows_386' => '102bda6e02b193a9417e80795875bf7d18259fc5daff3d048d274beef690eb26',
'0.4.0_darwin_amd64' => '87a1b0f37e773d92c939ca7dd6a50985acc4fb4aaec31384756ef896aef4035b',
'0.4.0_linux_386' => 'e2d494654cfed1b9248734f5cb9d34dba9f356dffdcc8a09ab0ab85d170dba7c',
'0.4.0_linux_amd64' => '4f8cd1cc5d90be9e1326fee03d3c96289a4f8b9b6ccb062d228125a1adc9ea0c',
'0.4.0_windows_386' => '895387de34352f29e8cb91066b44750a958d4a44a88ac39e164cf9c62b521b08',
'0.4.0_web_ui' => '0ee574e616864b658ba6ecf16db1183b63c5a4a36401880fb0404a2ea18536a6'
}
default['consul']['source_revision'] = 'master'

Expand Down
2 changes: 1 addition & 1 deletion spec/unit/recipes/install_binary_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
it { expect(chef_run).to include_recipe('ark::default') }
it do
expect(chef_run).to dump_ark('consul')
.with(version: '0.3.1')
.with(version: '0.4.0')
.with(path: '/usr/local/bin')
end
it { expect(chef_run).to touch_file('/usr/local/bin/consul') }
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/recipes/ui_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
it do
expect(chef_run).to put_ark('consul_ui')
.with(path: '/var/lib/consul/ui')
.with(version: '0.3.1')
.with(version: '0.4.0')
end
end

0 comments on commit a7cd8b3

Please sign in to comment.