From 8ca404724ada3f7998c59131b572a2bfca14c146 Mon Sep 17 00:00:00 2001 From: Bruno Rubin dos Santos Date: Wed, 23 Sep 2015 12:41:31 +1200 Subject: [PATCH] Versioned packages and support for x64 and x86 --- README.md | 5 +++-- attributes/default.rb | 22 ++++++++++++++++------ 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index cf10c23..280c61d 100644 --- a/README.md +++ b/README.md @@ -12,14 +12,15 @@ The following attributes are used to configure tentacle related attributes, acce Attribute | Description | Default -----------------------------|-------------------------------------------------------------------------------------|--------------------- -url |The download url of the octopus tentacle installation package |`http://download.octopusdeploy.com/octopus/Octopus.Tentacle.2.6.0.778-x64.msi` -checksum |The checksum of the tentacle installation package (SHA-256 hash) |`cb81f5296f7843c5c04cb20a02793bb14dad50f6453a0f264ebe859e268d8289` +version |The version of the octopus tentacle |`2.6.0.778` package_name |The package name of the octopus tentacle msi package |`Octopus Deploy Tentacle` install_dir |The installation directory of where to install the tentacle |`C:\Program Files\Octopus Deploy\Tentacle` port |The port that the tentacle will listen on |`10933` home |The home directory for the tenacle |`C:\Octopus` role |The role that will be assigned to the tentacle |`webserver` name |The name of the tentacle |`Tentacle` +url |The download url of the octopus tentacle installation package |`https://download.octopusdeploy.com/octopus/Octopus.Tentacle.#{node['octopus']['tentacle']['version']}-x64.msi` +checksum |The checksum of the tentacle installation package (SHA-256 hash) |`cb81f5296f7843c5c04cb20a02793bb14dad50f6453a0f264ebe859e268d8289` ### API Attributes The following attributes are used to configure octopus api related attributes, accessible via `node['octopus']['api'][attribute]`. diff --git a/attributes/default.rb b/attributes/default.rb index f30179c..4802e1d 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,5 +1,5 @@ -default['octopus']['tentacle']['url'] = "http://download.octopusdeploy.com/octopus/Octopus.Tentacle.2.6.0.778-x64.msi" -default['octopus']['tentacle']['checksum'] = "cb81f5296f7843c5c04cb20a02793bb14dad50f6453a0f264ebe859e268d8289" +# Octopus Tentacle attributes +default['octopus']['tentacle']['version'] = "2.6.0.778" default['octopus']['tentacle']['package_name'] = "Octopus Deploy Tentacle" default['octopus']['tentacle']['install_dir'] = "C:\\Program Files\\Octopus Deploy\\Tentacle" default['octopus']['tentacle']['port'] = "10933" @@ -8,13 +8,23 @@ default['octopus']['tentacle']['name'] = "Tentacle" default['octopus']['tentacle']['environment'] = "Test" +# Octopus Tools attributes +default['octopus']['tools']['version'] = "2.5.10.39" +default['octopus']['tools']['url'] = "http://download.octopusdeploy.com/octopus-tools/#{node['octopus']['tools']['version']}/OctopusTools.#{node['octopus']['tools']['version']}.zip" +default['octopus']['tools']['checksum'] = "0790ed04518e0b50f3000093b4a2b4ad47f0f5c9af269588e82d960813abfd67" +default['octopus']['tools']['home'] = "C:\\tools\\OctopusTools.#{node['octopus']['tools']['version']}" + # replace with your octopus server thumbprint default['octopus']['server']['thumbprint'] = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" -default['octopus']['tools']['url'] = "http://download.octopusdeploy.com/octopus-tools/2.5.10.39/OctopusTools.2.5.10.39.zip" -default['octopus']['tools']['checksum'] = "0790ed04518e0b50f3000093b4a2b4ad47f0f5c9af269588e82d960813abfd67" -default['octopus']['tools']['home'] = "C:\\tools\\OctopusTools.2.5.10.39" - # replace with your octopus server api endpoint and key default['octopus']['api']['uri'] = "http://my-octopus-server.com/api" default['octopus']['api']['key'] = "API-XXXXXXXXXXXXXXXXXXXXXXXXXXX" + +if node['kernel']['machine'] =~ /x86_64/ + default['octopus']['tentacle']['url'] = "https://download.octopusdeploy.com/octopus/Octopus.Tentacle.#{node['octopus']['tentacle']['version']}-x64.msi" + default['octopus']['tentacle']['checksum'] = "cb81f5296f7843c5c04cb20a02793bb14dad50f6453a0f264ebe859e268d8289" +else + default['octopus']['tentacle']['url'] = "https://download.octopusdeploy.com/octopus/Octopus.Tentacle.#{node['octopus']['tentacle']['version']}.msi" + default['octopus']['tentacle']['checksum'] = "725222257424115455b4b8e38584aa5112e3be93bb30fea9345544e4ab7a2555" +end \ No newline at end of file