abiquo-chef-agent 1.0.6 → 1.0.7

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.
Files changed (3) hide show
  1. data/bin/abiquo-chef-run +10 -8
  2. data/lib/abiquo-chef-agent.rb +1 -1
  3. metadata +12 -12
data/bin/abiquo-chef-run CHANGED
@@ -131,9 +131,9 @@ else
131
131
  # Write first-boot.json attributes
132
132
  #
133
133
  if not recipes.empty?
134
- recipes_json = '"run_list": ["'
135
- recipes_json << recipes.join(',')
136
- recipes_json << '"]'
134
+ recipes_json = '"run_list": ['
135
+ recipes_json << (recipes.map{ |r| "\"#{r}\""}).join(',')
136
+ recipes_json << ']'
137
137
  File.open('/etc/chef/first-boot.json', 'w') do |f|
138
138
  f.puts "{"
139
139
  f.puts recipes_json
@@ -157,11 +157,13 @@ else
157
157
  #
158
158
  # Remove validation certs and bootstrap XML
159
159
  #
160
- if File.exist?(Abiquo::Chef::Config.validation_cert)
161
- FileUtils.rm(Abiquo::Chef::Config.validation_cert)
162
- end
163
- if File.exist?(Abiquo::Chef::Config.bootstrap_backup_file)
164
- FileUtils.rm(Abiquo::Chef::Config.bootstrap_backup_file)
160
+ if not ENV['ABIQUO_DEBUG']
161
+ if File.exist?(Abiquo::Chef::Config.validation_cert)
162
+ FileUtils.rm(Abiquo::Chef::Config.validation_cert)
163
+ end
164
+ if File.exist?(Abiquo::Chef::Config.bootstrap_backup_file)
165
+ FileUtils.rm(Abiquo::Chef::Config.bootstrap_backup_file)
166
+ end
165
167
  end
166
168
  if $? != 0
167
169
  log "chef-client run failed", :error
data/lib/abiquo-chef-agent.rb CHANGED
@@ -3,7 +3,7 @@ require 'xmlsimple'
3
3
  module Abiquo
4
4
  module Chef
5
5
 
6
- VERSION="1.0.6"
6
+ VERSION="1.0.7"
7
7
 
8
8
  class Config
9
9
  def self.chef_config_dir
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: abiquo-chef-agent
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.6
4
+ version: 1.0.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2011-11-10 00:00:00.000000000 Z
12
+ date: 2011-11-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: run-as-root
16
- requirement: &20338440 !ruby/object:Gem::Requirement
16
+ requirement: &16321900 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *20338440
24
+ version_requirements: *16321900
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: chef
27
- requirement: &20337840 !ruby/object:Gem::Requirement
27
+ requirement: &16337700 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *20337840
35
+ version_requirements: *16337700
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: daemons
38
- requirement: &20337240 !ruby/object:Gem::Requirement
38
+ requirement: &16336920 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *20337240
46
+ version_requirements: *16336920
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rest-client
49
- requirement: &20336640 !ruby/object:Gem::Requirement
49
+ requirement: &16336120 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *20336640
57
+ version_requirements: *16336120
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: xml-simple
60
- requirement: &20336020 !ruby/object:Gem::Requirement
60
+ requirement: &16335440 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *20336020
68
+ version_requirements: *16335440
69
69
  description: Abiquo Chef Agent
70
70
  email: srubio@abiquo.com
71
71
  executables: