corl 0.4.28 → 0.4.29

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: 45dcd109e6897f16f0d9119625d0013b74aff5f1
4
- data.tar.gz: c8d0d0a1c6c32dfc095ca4b5c0f31022405cfd39
3
+ metadata.gz: f4340000f307af2a3bfc2bf2922ba022fe8189ae
4
+ data.tar.gz: 521b4c70644a3a91a947e09e2c11149263064633
5
5
  SHA512:
6
- metadata.gz: 698c8d4b68179189ec568e055722a88d67fd833164705bef9a281a22aa304260d47e5fd7d49931eb289f85564711bb89a2b75eef61feb8c39e40c637e608c0d0
7
- data.tar.gz: ef618b2861629c106df9a9a876eadcb146221c7e828a10e4e26d3d4225f7fb4df16217512eb0de7a0f4e998b4ea06991677ba8addba3862eae63c1f5436bed6c
6
+ metadata.gz: ef2f1fb2d2113a8493527c544afa3a9818a22f7cd93eedb08eeec0d17a0f9d4f3deb2c0c492c9fbe04fe14dcf047bef98bc9d12cccbf2a876aa2478545f649ad
7
+ data.tar.gz: 59ed2e3c471866ceed1216bf6577a4fdcc2d50b3d19e8f22000ddfc00f82020b357f1e71d6cc1a42b76e7bc630d5d90b34728c86396ed74be80916a994b4920b
data/.gitmodules CHANGED
@@ -1,4 +1,7 @@
1
1
 
2
2
  [submodule "bootstrap"]
3
3
  path = bootstrap
4
- url = git://github.com/coralnexus/corl-bootstrap.git
4
+ url = https://github.com/coralnexus/corl-bootstrap.git
5
+ [submodule "rdoc/template"]
6
+ path = rdoc/template
7
+ url = https://github.com/coralnexus/rdoc-darkfish-template.git
data/Gemfile.lock CHANGED
@@ -36,7 +36,7 @@ GIT
36
36
  PATH
37
37
  remote: .
38
38
  specs:
39
- corl (0.4.28)
39
+ corl (0.4.29)
40
40
  facter (~> 1.7)
41
41
  fog (~> 1.20)
42
42
  hiera (~> 1.3)
data/README.rdoc CHANGED
@@ -1,8 +1,26 @@
1
- === CORL (Coral Orchestration and Research Library)
1
+ ## Welcome to CORL (Coral Orchestration and Research Library)
2
+
3
+ CORL is a cloud application framework and command line utility that provides
4
+ easy and extensible creation and management of project based networks and nodes
5
+ and relevant infrastructure.
6
+
7
+ The CORL system is built on top of our general purpose Nucleon application
8
+ framework.
9
+
10
+
11
+
12
+
13
+
14
+
15
+
16
+
17
+
18
+
19
+
20
+
21
+
2
22
 
3
- Coming soon!
4
23
 
5
- Note: This library is still very early in development!
6
24
 
7
25
  ==== Contributing to CORL
8
26
 
data/Rakefile CHANGED
@@ -63,16 +63,29 @@ task :default => :spec
63
63
  version = CORL.VERSION
64
64
  doc_title = "corl #{version}"
65
65
 
66
+ class RDoc::Options
67
+ def template_dir_for(template)
68
+ File.join(File.dirname(__FILE__), 'rdoc', 'template')
69
+ end
70
+ end
71
+
66
72
  Rake::RDocTask.new do |rdoc|
67
- rdoc.rdoc_dir = 'rdoc'
73
+ rdoc.rdoc_dir = File.join('rdoc', 'site', version)
74
+
68
75
  rdoc.title = doc_title
69
- rdoc.rdoc_files.include('README*')
76
+ rdoc.main = 'README.rdoc'
77
+
78
+ rdoc.options << '--line-numbers'
79
+ rdoc.options << '--all'
80
+ rdoc.options << '-w' << '2'
81
+
82
+ rdoc.rdoc_files.include('*.rdoc')
70
83
  rdoc.rdoc_files.include('lib/**/*.rb')
71
84
  end
72
85
 
73
86
  #---
74
87
 
75
88
  YARD::Rake::YardocTask.new do |ydoc|
76
- ydoc.files = [ 'README*', 'lib/**/*.rb' ]
89
+ ydoc.files = [ '*.rdoc', 'lib/**/*.rb' ]
77
90
  ydoc.options = [ "--output-dir yardoc", "--title '#{doc_title}'" ]
78
91
  end
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.4.28
1
+ 0.4.29
data/corl.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "corl"
8
- s.version = "0.4.28"
8
+ s.version = "0.4.29"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Adrian Webb"]
12
- s.date = "2014-05-16"
12
+ s.date = "2014-05-21"
13
13
  s.description = "Framework that provides a simple foundation for growing organically in the cloud"
14
14
  s.email = "adrian.webb@coralnexus.com"
15
15
  s.executables = ["corl"]
@@ -14,7 +14,7 @@ class Facts < Plugin::CloudAction
14
14
  ensure_node(node) do
15
15
  facter_facts = Config.facts
16
16
 
17
- ui.info(Util::Data.to_json(facter_facts, true))
17
+ ui.info(Util::Data.to_json(facter_facts, true), { :prefix => false })
18
18
  myself.result = facter_facts
19
19
  end
20
20
  end
@@ -36,7 +36,7 @@ class Lookup < Plugin::CloudAction
36
36
  property = settings.delete(:property)
37
37
  value = lookup(property, nil, settings)
38
38
 
39
- ui.info(Util::Data.to_json(value, true))
39
+ ui.info(Util::Data.to_json(value, true), { :prefix => false })
40
40
  myself.result = value
41
41
  end
42
42
  end
@@ -82,6 +82,7 @@ class Puppetnode < CORL.plugin_class(:provisioner)
82
82
  # TODO: Figure out how to store these damn settings in a specialized
83
83
  # environment without phantom empty environment issues.
84
84
 
85
+ Puppet[:data_binding_terminus] = 'corl'
85
86
  Puppet[:default_file_terminus] = :file_server
86
87
  Puppet[:node_name_value] = id.to_s
87
88
 
@@ -74,14 +74,21 @@ module Lookup
74
74
  hiera_config = CORL.config(:hiera, config)
75
75
  loaded_facts = Util::Data.prefix('::', hiera_facts, '')
76
76
 
77
+ if hiera_config[:hierarchy]
78
+ hiera_config[:hierarchy].delete('common')
79
+ end
80
+
77
81
  unless loaded_facts.empty?
78
82
  hiera_config[:hierarchy].collect! do |search|
79
83
  Hiera::Interpolate.interpolate(search, loaded_facts, {})
80
84
  end
81
85
  end
82
86
 
83
- unless config[:hierarchy]
84
- config[:hierarchy] = [ "common" ]
87
+ unless hiera_config[:hierarchy]
88
+ hiera_config[:hierarchy] = [ 'common' ]
89
+ end
90
+ unless hiera_config[:hierarchy].include?('common')
91
+ hiera_config[:hierarchy] << 'common'
85
92
  end
86
93
  hiera_config.export
87
94
  end
@@ -16,6 +16,8 @@ class InitKeys < BaseAction
16
16
  comm.execute("echo '#{ssh_key}' > \$HOME/.ssh/authorized_keys")
17
17
  end
18
18
  node.set_cache_setting(:use_private_key, true)
19
+ env[:machine].config.ssh.private_key_path = node.private_key
20
+
19
21
  node.machine.load
20
22
  end
21
23
  end
@@ -32,9 +32,6 @@ class CORL < ::Vagrant.plugin("2", :provisioner)
32
32
 
33
33
  if network && node
34
34
  # Provision the server
35
-
36
- dbg(node.profiles, 'profiles')
37
-
38
35
  success = network.init_node(node, clean(::CORL.config(:vagrant_node_init, {
39
36
  :force => config.force_updates,
40
37
  :home => config.user_home,
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: corl
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.28
4
+ version: 0.4.29
5
5
  platform: ruby
6
6
  authors:
7
7
  - Adrian Webb
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-16 00:00:00.000000000 Z
11
+ date: 2014-05-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nucleon