dtk-node-agent 0.10.4 → 0.10.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a7c1bb1dcb2e60109da5f3a8e43fb88b4db57e96
4
- data.tar.gz: 4e7149295c373299461fc594b0dd458e9ec96160
3
+ metadata.gz: 2ea2bafe1e5ae5c8816111cfc2df9e8775926dce
4
+ data.tar.gz: c19723f600e554585e351376d1526cb72809bbb6
5
5
  SHA512:
6
- metadata.gz: 7d284aa8af086ebb026521b6a00430adb878b24bc56ed450b9bc1c32140145adeaf61c3a1e5c3a63a3b3542535bde304361041797ba6951fe39dda3059d47aea
7
- data.tar.gz: fd91a8a50fea2d018782bfa6aff9fb3738789367c3def55fe60aab90454d451ead53e3b43dc691916854a2c704b3682fad4e8a7f3bf3a851273a154126a36053
6
+ metadata.gz: 6cd227f3e46659d63eb56fc6e3c189c64d88f7cf35563199d214502623686781bad9329a514c25d1739e83e49113f576a96f01464cd55cf2e5c856bd1b336787
7
+ data.tar.gz: be7e5eb2bac7ab0c54a47edb15a897694131fa36e5a439e07487665842ed582d9abd2492e6c761faf32900130133be8b38f2a997b9b0e41be93be00a5c08e11b
@@ -15,5 +15,6 @@
15
15
  :upgrades => {
16
16
  :redhat => ['openssl', 'bash', 'emacs-nox', 'vim-enhanced', 'monit'],
17
17
  :debian => ['openssl', 'bash', 'emacs23-nox', 'vim', 'monit']
18
- }
18
+ },
19
+ :arbiter_branch => 'stable'
19
20
  }
@@ -45,7 +45,7 @@ module DTK
45
45
  if @osfamily == 'debian'
46
46
  # set up apt and install packages
47
47
  shell "apt-get update --fix-missing"
48
- shell "apt-get install -y build-essential wget curl git"
48
+ shell "apt-get install -y build-essential wget curl git libicu-dev zlib1g-dev"
49
49
  # install upgrades
50
50
  Array(CONFIG[:upgrades][:debian]).each do |package|
51
51
  shell "apt-get install -y #{package}"
@@ -66,7 +66,7 @@ module DTK
66
66
  # pin down the puppetlabs apt repo
67
67
  FileUtils.cp("#{base_dir}/src/etc/apt/preferences.d/puppetlabs", "/etc/apt/preferences.d/puppetlabs")
68
68
  elsif @osfamily == 'redhat'
69
- shell "yum -y install yum-utils wget curl"
69
+ shell "yum -y install yum-utils wget curl libicu-devel zlib-devel"
70
70
  # do a full upgrade
71
71
  shell "yum -y update"
72
72
  case @osmajrelease
@@ -112,22 +112,21 @@ module DTK
112
112
 
113
113
  puts "Installing DTK Arbiter"
114
114
  install_arbiter
115
- end
116
-
115
+ end
117
116
 
118
117
  private
119
-
118
+
120
119
  def self.parse(argv)
121
120
  options = {}
122
121
  parser = OptionParser.new do |opts|
123
122
  opts.banner = <<-BANNER
124
123
  usage:
125
-
124
+
126
125
  dtk-node-agent [-p|--puppet-version] [-v|--version]
127
126
  BANNER
128
127
  opts.on("-d",
129
128
  "--debug",
130
- "enable debug mode") { |v| options[:debug] = true }
129
+ "enable debug mode") { |v| options[:debug] = true }
131
130
  opts.on_tail("-v",
132
131
  "--version",
133
132
  "Print the version and exit.") do
@@ -145,7 +144,7 @@ module DTK
145
144
  parser.parse!(argv)
146
145
 
147
146
  options
148
-
147
+
149
148
  rescue OptionParser::InvalidOption => e
150
149
  $stderr.puts e.message
151
150
  exit(12)
@@ -203,7 +202,8 @@ module DTK
203
202
  end
204
203
 
205
204
  def self.install_arbiter
206
- shell "git clone -b DTK-2654 https://github.com/dtk/dtk-arbiter /usr/share/dtk/dtk-arbiter"
205
+ arbiter_branch = CONFIG[:arbiter_branch] || 'stable'
206
+ shell "git clone -b #{arbiter_branch} https://github.com/dtk/dtk-arbiter /usr/share/dtk/dtk-arbiter"
207
207
  Dir.chdir "/usr/share/dtk/dtk-arbiter"
208
208
  shell "bundle install --without development"
209
209
  puts "Installing dtk-arbiter init script"
@@ -214,7 +214,9 @@ module DTK
214
214
  puts "Installing dtk-arbiter monit config."
215
215
  monit_cfg_path = (@osfamily == 'debian') ? "/etc/monit/conf.d" : "/etc/monit.d"
216
216
  set_init("monit")
217
- FileUtils.ln_sf("/usr/share/dtk/dtk-arbiter/etc/dtk-arbiter.monit", "#{monit_cfg_path}/dtk-arbiter") if File.exist?(monit_cfg_path)
217
+ logrotate_cfg_path = "/usr/share/dtk/dtk-arbiter/etc/dtk-arbiter.logrotate"
218
+ FileUtils.ln_sf("/usr/share/dtk/dtk-arbiter/etc/dtk-arbiter.monit", "#{monit_cfg_path}/dtk-arbiter") if File.exist?(monit_cfg_path)
219
+ FileUtils.cp(logrotate_cfg_path, "/etc/logrotate.d/dtk-arbiter") if File.exist?(logrotate_cfg_path)
218
220
  end
219
221
  end
220
222
  end
@@ -16,5 +16,5 @@
16
16
  # limitations under the License.
17
17
  #
18
18
  module DtkNodeAgent
19
- VERSION="0.10.4"
19
+ VERSION="0.10.5"
20
20
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dtk-node-agent
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.4
4
+ version: 0.10.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rich PELAVIN
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-02-06 00:00:00.000000000 Z
11
+ date: 2017-02-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: puppet
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
217
217
  version: '0'
218
218
  requirements: []
219
219
  rubyforge_project:
220
- rubygems_version: 2.5.1
220
+ rubygems_version: 2.4.1
221
221
  signing_key:
222
222
  specification_version: 4
223
223
  summary: DTK Node Agent gem.