dtk-node-agent 0.6.4 → 0.6.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/dtk-node-agent/installer.rb +5 -3
- data/lib/dtk-node-agent/version.rb +1 -1
- data/src/etc/apt/preferences.d/puppetlabs +3 -0
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 85f8d6ff17f511126ef50045eb00df6ed4927c03
|
|
4
|
+
data.tar.gz: d3cc6438de22cd32cf8e2468261ead9071e798c0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9d8cc97113aecaddb6c42857979e32822816b3999c80699e6bb65a56e356c11dfab5c23a1495362654e73404d9e2c03dadd5b22cfbe1a0dbaa12786ac2bcb5d2
|
|
7
|
+
data.tar.gz: c88deee409b86539366a253c4174e063dadfb6a30f3f2c5c31c781853415f412955b49a0fab5b12bec0f454a30cf4c6beff83b7a719a2369051bd1e9e3eb2ddf
|
|
@@ -6,7 +6,7 @@ module DTK
|
|
|
6
6
|
# read configuration
|
|
7
7
|
CONFIG = eval(File.open(File.expand_path('../config/install.config', File.dirname(__FILE__))) {|f| f.read })
|
|
8
8
|
|
|
9
|
-
#
|
|
9
|
+
# get OS facts
|
|
10
10
|
@osfamily = Facter.value('osfamily').downcase
|
|
11
11
|
@osname = Facter.value('operatingsystem')
|
|
12
12
|
@osmajrelease = Facter.value('operatingsystemmajrelease')
|
|
@@ -41,8 +41,10 @@ module DTK
|
|
|
41
41
|
# install mcollective
|
|
42
42
|
puts "Installing MCollective..."
|
|
43
43
|
shell "apt-get -y install mcollective"
|
|
44
|
+
# pin down the puppetlabs apt repo
|
|
45
|
+
FileUtils.cp("#{base_dir}/src/etc/apt/preferences.d/puppetlabs", "/etc/apt/preferences.d/puppetlabs")
|
|
44
46
|
elsif @osfamily == 'redhat'
|
|
45
|
-
shell "yum -y install yum-utils wget
|
|
47
|
+
shell "yum -y install yum-utils wget curl"
|
|
46
48
|
# install upgrades
|
|
47
49
|
Array(CONFIG[:upgrades][:redhat]).each do |package|
|
|
48
50
|
shell "yum -y install #{package}"
|
|
@@ -68,7 +70,7 @@ module DTK
|
|
|
68
70
|
shell "yum -y install git"
|
|
69
71
|
# install ec2-run-user-data init script
|
|
70
72
|
# but only if the machine is running on AWS
|
|
71
|
-
if `
|
|
73
|
+
if `curl -m 5 -sI http://169.254.169.254/latest/meta-data/`.include? '200 OK'
|
|
72
74
|
FileUtils.cp("#{base_dir}/src/etc/init.d/ec2-run-user-data", "/etc/init.d/ec2-run-user-data") unless File.exist?("/etc/init.d/ec2-run-user-data")
|
|
73
75
|
set_init("ec2-run-user-data")
|
|
74
76
|
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.6.
|
|
4
|
+
version: 0.6.6
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Rich PELAVIN
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-11-07 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: puppet
|
|
@@ -197,6 +197,7 @@ files:
|
|
|
197
197
|
- puppet_additions/puppet_lib_base/puppet/indirector/catalog/r8_storeconfig_backend.rb
|
|
198
198
|
- puppet_additions/puppet_lib_base/puppet/indirector/r8_storeconfig_backend.rb
|
|
199
199
|
- puppet_additions/puppet_lib_base/puppet/indirector/resource/r8_storeconfig_backend.rb
|
|
200
|
+
- src/etc/apt/preferences.d/puppetlabs
|
|
200
201
|
- src/etc/init.d/ec2-run-user-data
|
|
201
202
|
- src/etc/logrotate.d/mcollective
|
|
202
203
|
- src/etc/logrotate.d/puppet
|