Skip to content

Commit

Permalink
Merge pull request #344 from vijaybandari/master
Browse files Browse the repository at this point in the history
consul 0.7.0 version updates
  • Loading branch information
legal90 authored Sep 19, 2016
2 parents 9ed4022 + 23bf94c commit a43dc10
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 14 deletions.
2 changes: 1 addition & 1 deletion attributes/default.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

default['consul']['service']['config_dir'] = join_path config_prefix_path, 'conf.d'

default['consul']['version'] = '0.6.4'
default['consul']['version'] = '0.7.0'

# Windows only
default['consul']['service']['nssm_params'] = {
Expand Down
13 changes: 12 additions & 1 deletion libraries/consul_installation_binary.rb
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ def self.binary_checksum(node, resource)
when '0.6.1' then '358654900772b3477497f4a5b5a841f2763dc3062bf29212606a97f5a7a675f3'
when '0.6.2' then '3089f77fcdb922894456ea6d0bc78a2fb60984d1d3687fa9d8f604b266c83446'
when '0.6.3' then '6dff4ffc61d66aacd627a176737b8725624718a9e68cc81460a3df9b241c7932'
when '0.6.4' then '75422bbd26107cfc5dfa7bbb65c1d8540a5193796b5c6b272d8d70b094b26488 '
when '0.6.4' then '75422bbd26107cfc5dfa7bbb65c1d8540a5193796b5c6b272d8d70b094b26488'
when '0.7.0' then '74111674527c5be0db7a98600df8290395abdd94e2cd86bda7418d748413396d'
end
when 'darwin-i386'
case resource.version
Expand All @@ -110,12 +111,14 @@ def self.binary_checksum(node, resource)
when '0.6.2' then '973105816261c8001fcfa76c9fb707fa56325460476fb0daa97b9ece0602a918'
when '0.6.3' then '7fb30756504cd9559c9b23e5d0d8d73a847ee62ed85d39955b5906c2f59a5bc1'
when '0.6.4' then '4cd39e968ca6bed0888f831a2fc438ffe0b48dab863c822e777f5b5219bacf5c'
when '0.7.0' then '16ab91969c9b268ccae532070221b6c4fecaad298e4662a46cdfe9847c80dd3f'
end
when 'solaris-amd64'
case resource.version
when '0.6.2' then 'f5655f0b173e5d51c5b92327d1fc7f24ac0939897a1966da09146e4eb75af9d1'
when '0.6.3' then 'e6a286ff17a2345b8800732850eadb858b3dba9486355e1164a774ccec2f0e98'
when '0.6.4' then 'c26a64310f83c3ba388c78d5b89d640d961ae9eabe221c244bfffcfa753966bd'
when '0.7.0' then '0f1db173a95861bc84940b4dcdb2debfbfbc18f2b50e651d0e23dfda331018ea'
end
when 'windows-amd64'
case resource.version
Expand All @@ -124,6 +127,7 @@ def self.binary_checksum(node, resource)
when '0.6.2' then 'df3234fb7def7138b7cb8c73fe7c05942ec1e485925701a7b38fc7e2396a212f'
when '0.6.3' then '04cd1fdc9cd3a27ffc64e312e40142db7af0d240608f8080ec6d238294b20652'
when '0.6.4' then '1ca3cc2943b27ec8968665efce1122d4ea355ccbde5b4807753af71f11190a9b'
when '0.7.0' then 'ac5973a58dd9c6f52c784a7106a29adcf7c94015036538155b6c0ee7efc3a330'
end
when 'windows-i386'
case resource.version
Expand All @@ -135,6 +139,7 @@ def self.binary_checksum(node, resource)
when '0.6.2' then 'f072d89c098dde143897e653d5adaf23125b58062344ef4be4029d635f959654'
when '0.6.3' then '55733a730c5055d0ed1dc2656b2b6a27b21c7c361a907919cfae90aab2dff870'
when '0.6.4' then '6555f0fff6c3f9ea310c94a73365d9892afc255efb47c85041ad1c0ede854b87'
when '0.7.0' then 'd0ddfe7d1de9879f02b0d110e45bb74cd5028a2910bcac8b2629d0659367cd96'
end
when 'linux-amd64'
case resource.version
Expand All @@ -146,6 +151,7 @@ def self.binary_checksum(node, resource)
when '0.6.2' then '7234eba9a6d1ce169ff8d7af91733e63d8fc82193d52d1b10979d8be5c959095'
when '0.6.3' then 'b0532c61fec4a4f6d130c893fd8954ec007a6ad93effbe283a39224ed237e250'
when '0.6.4' then 'abdf0e1856292468e2c9971420d73b805e93888e006c76324ae39416edcf0627'
when '0.7.0' then 'b350591af10d7d23514ebaa0565638539900cdb3aaa048f077217c4c46653dd8'
end
when 'linux-i386'
case resource.version
Expand All @@ -157,6 +163,7 @@ def self.binary_checksum(node, resource)
when '0.6.2' then '500ac8c75768b7f2d63521d2501ff8cc5fb7f9ddf6c550e9449364810c96f419'
when '0.6.3' then '2afb65383ab913344daaa9af827c1e8576c7cae16e93798048122929b6e4cc92'
when '0.6.4' then 'dbaf5ad1c95aa7dce1625d61b6686d3775e53cb3e7d6c426d29ea96622d248a8'
when '0.7.0' then 'babf618b1f10455b4ab65b91bdf5d5a7be5bfbb874ce41e8051caca884c43378'
end
when 'linux-arm'
case resource.version
Expand All @@ -165,6 +172,7 @@ def self.binary_checksum(node, resource)
when '0.6.2' then 'b6b4f66f6dd8b1d4ebbd0339f4ed78c4853c7bd0d42fd15af70179b5bc65482e'
when '0.6.3' then 'c5fd5278be2757d2468bc7e263af15bc9a9e80fc5108fec658755804ea9bca56'
when '0.6.4' then '81200fc8b7965dfc6048c336925211eaf2c7247be5d050946a5dd4d53ec9817e'
when '0.7.0' then '7c9ee149d66d14cc8aa81b8d86e7df5a27876216578ab841ab3921e7f4a0ce4b'
end
when 'freebsd-amd64'
case resource.version
Expand All @@ -173,6 +181,7 @@ def self.binary_checksum(node, resource)
when '0.6.2' then '1ccf96cb58c6fa927ee21c24d9be368ebe91559ed32626a89a715a3781659e3f'
when '0.6.3' then '8bdf2da41e6118af18af9aba0a127d4abb3453a20a9064e1bd1206f5c11ac2c8'
when '0.6.4' then 'fe0b04a2111c6274e79cc86a91b48cb63879f0badd4d6dc848cb7105a572c7fd'
when '0.7.0' then '54c864ce0deeeb01d10752a787c3bc3154d6fb020859fcc8b089ac3548756702'
end
when 'freebsd-i386'
case resource.version
Expand All @@ -181,6 +190,7 @@ def self.binary_checksum(node, resource)
when '0.6.2' then 'fc87f2ddd2090031e79136954d9e3f85db480d5ed9eba6ae627bf460e4c95e6e'
when '0.6.3' then '4a1aa8f570852eb238b7406172c097f5b32f41a3f01186111e576faa7506248c'
when '0.6.4' then 'c2d0f7d5f785a83eeb962209a35ebb577b41c7f8cb1f78bf68a42e8f8be77d22'
when '0.7.0' then 'fe7f80ce8fcdd517f4228b66a4836119ad6e22c2a5285cf4de02c0ccf8c2eefd'
end
when 'freebsd-arm'
case resource.version
Expand All @@ -189,6 +199,7 @@ def self.binary_checksum(node, resource)
when '0.6.2' then '30d8d09dd88cdd8d5256cea445fd0fed787d73cc6585e2eef7212161f29c8053'
when '0.6.3' then '5452d29f1cf0720c4ae0e0ec1cc5e44b0068a0340a6b61ab5ec245fa0f3447ad'
when '0.6.4' then 'edf3862e3fef6a48ede1d2671fe6b8da8891ca57bd5381b8a19d8d1b68e4d5da'
when '0.7.0' then '1b16624f3581a7bef5328d17ff4ab9188ffdd07543cab3fb72b3cd7a7d469724'
end
end
end
Expand Down
1 change: 1 addition & 0 deletions libraries/consul_installation_webui.rb
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ def self.binary_checksum(_node, resource)
when '0.6.2' then 'f144377b8078df5a3f05918d167a52123089fc47b12fc978e6fb375ae93afc90'
when '0.6.3' then '93bbb300cacfe8de90fb3bd5ede7d37ae6ce014898edc520b9c96a676b2bbb72'
when '0.6.4' then '5f8841b51e0e3e2eb1f1dc66a47310ae42b0448e77df14c83bb49e0e0d5fa4b7'
when '0.7.0' then '42212089c228a73a0881a5835079c8df58a4f31b5060a3b4ffd4c2497abe3aa8'
end
end
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
consul_installation '0.6.4' do
consul_installation '0.7.0' do
provider :webui
end
4 changes: 2 additions & 2 deletions test/integration/default/serverspec/default_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

consul_version = '0.6.4'
consul_version = '0.7.0'
consul_executable = "/opt/consul/#{consul_version}/consul"

describe file(consul_executable) do
Expand Down Expand Up @@ -33,7 +33,7 @@
end
end

describe command('/opt/consul/0.6.4/consul members -detailed') do
describe command('/opt/consul/0.7.0/consul members -detailed') do
its(:exit_status) { should eq 0 }
its(:stdout) { should match %r{\balive\b} }
its(:stdout) { should match %r{\brole=consul\b} }
Expand Down
4 changes: 2 additions & 2 deletions test/integration/zip/serverspec/default_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe file('C:\opt\consul\0.6.4\consul.exe') do
describe file('C:\opt\consul\0.7.0\consul.exe') do
it { should be_file }
end

Expand All @@ -15,7 +15,7 @@
end
end

describe command('& "C:\opt\consul\0.6.4\consul.exe" members -detailed') do
describe command('& "C:\opt\consul\0.7.0\consul.exe" members -detailed') do
its(:exit_status) { should eq 0 }
its(:stdout) { should match %r{\balive\b} }
its(:stdout) { should match %r{\brole=consul\b} }
Expand Down
12 changes: 6 additions & 6 deletions test/spec/libraries/consul_installation_webui_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@
pending('replace with poise-archive')

recipe do
consul_installation '0.6.4' do
consul_installation '0.7.0' do
provider :webui
end
end

it do is_expected.to create_directory('/opt/consul-webui/0.6.4')
it do is_expected.to create_directory('/opt/consul-webui/0.7.0')
.with(
recursive: true
)
Expand All @@ -28,11 +28,11 @@
)
end

it do is_expected.to unzip_zipfile('consul_0.6.4_web_ui.zip')
it do is_expected.to unzip_zipfile('consul_0.7.0_web_ui.zip')
.with(
checksum: '5f8841b51e0e3e2eb1f1dc66a47310ae42b0448e77df14c83bb49e0e0d5fa4b7',
path: '/opt/consul-webui/0.6.4',
source: 'https://releases.hashicorp.com/consul/0.6.4/consul_0.6.4_web_ui.zip'
checksum: '42212089c228a73a0881a5835079c8df58a4f31b5060a3b4ffd4c2497abe3aa8',
path: '/opt/consul-webui/0.7.0',
source: 'https://releases.hashicorp.com/consul/0.7.0/consul_0.7.0_web_ui.zip'
)
end
end
Expand Down
2 changes: 1 addition & 1 deletion test/spec/libraries/consul_service_windows_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
it {
skip('Add poise inversion system to consul_service otherwise windows tests will not pass')
expect(chef_run).to install_nssm('consul').with(
program: 'C:\Program Files\consul\0.6.4\consul.exe',
program: 'C:\Program Files\consul\0.7.0\consul.exe',
args: 'agent -config-file="""C:\Program Files\consul\consul.json""" -config-dir="""C:\Program Files\consul\conf.d"""'
)}
end
Expand Down

0 comments on commit a43dc10

Please sign in to comment.