From 701bc2213dc632aaacf76c8c6e7d8f69e5a447e0 Mon Sep 17 00:00:00 2001 From: John Dyer Date: Mon, 15 Sep 2014 16:25:47 -0400 Subject: [PATCH 1/2] Update for 0.4.0 --- attributes/default.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 7ed69d6a..30de7845 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -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'] = { @@ -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' From 0b1998f8fd1976902cdb1d0aa4cea662a4a3192d Mon Sep 17 00:00:00 2001 From: John Dyer Date: Mon, 15 Sep 2014 16:56:36 -0400 Subject: [PATCH 2/2] Update specs and readme for #42 --- CHANGELOG.md | 3 +++ README.md | 25 ++++++++++++++++++++++++ spec/unit/recipes/install_binary_spec.rb | 2 +- spec/unit/recipes/ui_spec.rb | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6985d981..672655e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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. diff --git a/README.md b/README.md index f872db40..bd2d5b8f 100644 --- a/README.md +++ b/README.md @@ -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] () and a growing community of [contributors][4]. diff --git a/spec/unit/recipes/install_binary_spec.rb b/spec/unit/recipes/install_binary_spec.rb index b0fa8470..188c4658 100644 --- a/spec/unit/recipes/install_binary_spec.rb +++ b/spec/unit/recipes/install_binary_spec.rb @@ -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') } diff --git a/spec/unit/recipes/ui_spec.rb b/spec/unit/recipes/ui_spec.rb index b7310b62..aa2163cb 100644 --- a/spec/unit/recipes/ui_spec.rb +++ b/spec/unit/recipes/ui_spec.rb @@ -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