corl 0.4.2 → 0.4.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (41) hide show
  1. data/Gemfile.lock +1 -1
  2. data/VERSION +1 -1
  3. data/corl.gemspec +12 -7
  4. data/lib/CORL/action/build.rb +30 -0
  5. data/lib/CORL/action/provision.rb +34 -8
  6. data/lib/CORL/configuration/file.rb +50 -64
  7. data/lib/CORL/provisioner/puppetnode.rb +186 -314
  8. data/lib/core/mixin/lookup.rb +20 -15
  9. data/lib/core/mixin/macro/network_settings.rb +52 -0
  10. data/lib/core/plugin/action.rb +1 -1
  11. data/lib/core/plugin/configuration.rb +43 -4
  12. data/lib/core/plugin/network.rb +16 -3
  13. data/lib/core/plugin/node.rb +69 -2
  14. data/lib/core/plugin/provisioner.rb +286 -11
  15. data/lib/{CORL/provisioner/puppetnode → core/util/puppet}/resource.rb +36 -40
  16. data/lib/{CORL/provisioner/puppetnode → core/util/puppet}/resource_group.rb +33 -41
  17. data/lib/core/util/puppet.rb +303 -0
  18. data/lib/corl.rb +34 -11
  19. data/lib/facter/corl_build.rb +8 -0
  20. data/lib/facter/corl_exists.rb +3 -3
  21. data/lib/facter/corl_network.rb +1 -1
  22. data/lib/facter/custom_facts.rb +24 -0
  23. data/lib/facter/vagrant_exists.rb +15 -0
  24. data/lib/hiera/corl_logger.rb +1 -1
  25. data/lib/puppet/indirector/corl.rb +2 -2
  26. data/lib/puppet/parser/functions/corl_include.rb +10 -14
  27. data/lib/puppet/parser/functions/corl_initialize.rb +15 -0
  28. data/lib/puppet/parser/functions/{deep_merge.rb → corl_merge.rb} +4 -4
  29. data/lib/puppet/parser/functions/corl_resources.rb +9 -4
  30. data/lib/puppet/parser/functions/global_array.rb +1 -1
  31. data/lib/puppet/parser/functions/global_hash.rb +1 -1
  32. data/lib/puppet/parser/functions/global_param.rb +1 -1
  33. data/lib/puppet/parser/functions/interpolate.rb +1 -1
  34. data/lib/puppet/parser/functions/module_array.rb +8 -9
  35. data/lib/puppet/parser/functions/module_hash.rb +7 -8
  36. data/lib/puppet/parser/functions/module_param.rb +4 -5
  37. data/lib/puppet/parser/functions/name.rb +1 -1
  38. data/lib/puppet/parser/functions/render.rb +5 -5
  39. metadata +34 -29
  40. data/lib/CORL/extension/puppetloader.rb +0 -24
  41. data/lib/puppet/parser/functions/config_initialized.rb +0 -26
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: corl
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.2
4
+ version: 0.4.3
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: 2014-03-05 00:00:00.000000000 Z
12
+ date: 2014-03-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: nucleon
16
- requirement: &8964100 !ruby/object:Gem::Requirement
16
+ requirement: &11223780 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0.1'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *8964100
24
+ version_requirements: *11223780
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: fog
27
- requirement: &8963100 !ruby/object:Gem::Requirement
27
+ requirement: &11222760 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '1.20'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *8963100
35
+ version_requirements: *11222760
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: unf
38
- requirement: &8962060 !ruby/object:Gem::Requirement
38
+ requirement: &11221980 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0.1'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *8962060
46
+ version_requirements: *11221980
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: facter
49
- requirement: &8961060 !ruby/object:Gem::Requirement
49
+ requirement: &11221380 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '1.7'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *8961060
57
+ version_requirements: *11221380
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: hiera
60
- requirement: &8959780 !ruby/object:Gem::Requirement
60
+ requirement: &11220780 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '1.3'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *8959780
68
+ version_requirements: *11220780
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: puppet
71
- requirement: &8957320 !ruby/object:Gem::Requirement
71
+ requirement: &11220080 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '3.2'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *8957320
79
+ version_requirements: *11220080
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: bundler
82
- requirement: &8954800 !ruby/object:Gem::Requirement
82
+ requirement: &11219400 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '1.2'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *8954800
90
+ version_requirements: *11219400
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: jeweler
93
- requirement: &8952820 !ruby/object:Gem::Requirement
93
+ requirement: &11210660 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ~>
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '2.0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *8952820
101
+ version_requirements: *11210660
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rspec
104
- requirement: &8951080 !ruby/object:Gem::Requirement
104
+ requirement: &11209760 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '2.10'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *8951080
112
+ version_requirements: *11209760
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: rdoc
115
- requirement: &8944580 !ruby/object:Gem::Requirement
115
+ requirement: &11208300 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ~>
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '3.12'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *8944580
123
+ version_requirements: *11208300
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: yard
126
- requirement: &8943360 !ruby/object:Gem::Requirement
126
+ requirement: &11176660 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,7 +131,7 @@ dependencies:
131
131
  version: '0.8'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *8943360
134
+ version_requirements: *11176660
135
135
  description: Framework that provides a simple foundation for growing organically in
136
136
  the cloud
137
137
  email: adrian.webb@coralnexus.com
@@ -169,6 +169,7 @@ files:
169
169
  - corl.gemspec
170
170
  - lib/CORL/action/authorize.rb
171
171
  - lib/CORL/action/bootstrap.rb
172
+ - lib/CORL/action/build.rb
172
173
  - lib/CORL/action/destroy.rb
173
174
  - lib/CORL/action/exec.rb
174
175
  - lib/CORL/action/image.rb
@@ -184,7 +185,6 @@ files:
184
185
  - lib/CORL/action/stop.rb
185
186
  - lib/CORL/configuration/file.rb
186
187
  - lib/CORL/event/puppet.rb
187
- - lib/CORL/extension/puppetloader.rb
188
188
  - lib/CORL/machine/aws.rb
189
189
  - lib/CORL/machine/physical.rb
190
190
  - lib/CORL/machine/rackspace.rb
@@ -193,13 +193,12 @@ files:
193
193
  - lib/CORL/node/local.rb
194
194
  - lib/CORL/node/rackspace.rb
195
195
  - lib/CORL/provisioner/puppetnode.rb
196
- - lib/CORL/provisioner/puppetnode/resource.rb
197
- - lib/CORL/provisioner/puppetnode/resource_group.rb
198
196
  - lib/CORL/template/environment.rb
199
197
  - lib/core/errors.rb
200
198
  - lib/core/facade.rb
201
199
  - lib/core/mixin/action/keypair.rb
202
200
  - lib/core/mixin/lookup.rb
201
+ - lib/core/mixin/macro/network_settings.rb
203
202
  - lib/core/mod/fog_aws_server.rb
204
203
  - lib/core/mod/hiera_backend.rb
205
204
  - lib/core/plugin/action.rb
@@ -210,17 +209,23 @@ files:
210
209
  - lib/core/plugin/network.rb
211
210
  - lib/core/plugin/node.rb
212
211
  - lib/core/plugin/provisioner.rb
212
+ - lib/core/util/puppet.rb
213
+ - lib/core/util/puppet/resource.rb
214
+ - lib/core/util/puppet/resource_group.rb
213
215
  - lib/corl.rb
216
+ - lib/facter/corl_build.rb
214
217
  - lib/facter/corl_config_ready.rb
215
218
  - lib/facter/corl_exists.rb
216
219
  - lib/facter/corl_network.rb
220
+ - lib/facter/custom_facts.rb
221
+ - lib/facter/vagrant_exists.rb
217
222
  - lib/hiera/corl_logger.rb
218
223
  - lib/puppet/indirector/corl.rb
219
224
  - lib/puppet/indirector/data_binding/corl.rb
220
- - lib/puppet/parser/functions/config_initialized.rb
221
225
  - lib/puppet/parser/functions/corl_include.rb
226
+ - lib/puppet/parser/functions/corl_initialize.rb
227
+ - lib/puppet/parser/functions/corl_merge.rb
222
228
  - lib/puppet/parser/functions/corl_resources.rb
223
- - lib/puppet/parser/functions/deep_merge.rb
224
229
  - lib/puppet/parser/functions/ensure.rb
225
230
  - lib/puppet/parser/functions/file_exists.rb
226
231
  - lib/puppet/parser/functions/global_array.rb
@@ -1,24 +0,0 @@
1
-
2
- module CORL
3
- module Extension
4
- class Puppetloader < CORL.plugin_class(:extension)
5
-
6
- def register_plugins(config)
7
- connection = Manager.connection
8
- provisioners = connection.plugins(:provisioner, :puppetnode)
9
- provisioner = provisioners.empty? ? nil : provisioners[provisioners.keys.first]
10
-
11
- if provisioner
12
- # Register Puppet CORL extensions
13
- provisioner.env.modules.each do |mod|
14
- lib_dir = File.join(mod.path, 'lib', 'corl')
15
- if File.directory?(lib_dir)
16
- logger.debug("Registering Puppet module at #{lib_dir}")
17
- connection.register(lib_dir)
18
- end
19
- end
20
- end
21
- end
22
- end
23
- end
24
- end
@@ -1,26 +0,0 @@
1
- #
2
- # config_initialized.rb
3
- #
4
- # This function checks if the configuration system is fully configured
5
- # and ready to query.
6
- #
7
- module Puppet::Parser::Functions
8
- newfunction(:config_initialized, :type => :rvalue, :doc => <<-EOS
9
- This function checks if Hiera is fully configured and ready to query.
10
- EOS
11
- ) do |args|
12
-
13
- value = nil
14
- CORL.run do
15
- options = ( args[0].is_a?(Hash) ? args[0] : {} )
16
-
17
- config = CORL::Config.init_flat(options, [ :init, :config_initialized ], {
18
- :hiera_scope => self,
19
- :puppet_scope => self,
20
- :init_fact => 'corl_config_ready'
21
- })
22
- value = CORL::Config.initialized?(config)
23
- end
24
- return value
25
- end
26
- end