corl 0.5.3 → 0.5.4

data/lib/core/plugin/fog_node.rb

@@ -5,84 +5,84 @@ nucleon_require(File.dirname(__FILE__), :node)
 
 module CORL
 module Node
-class Fog < Nucleon.plugin_class(:CORL, :node)
- 
+class FogBase < Nucleon.plugin_class(:CORL, :node)
+
   #-----------------------------------------------------------------------------
   # Node plugin interface
-   
+
   def normalize(reload)
     super
-    
+
     @region_info = Config.new({}, {}, true, false) unless reload
-    
-    myself.region = region 
-      
-    unless reload     
+
+    myself.region = region
+
+    unless reload
       machine_provider = :fog
       machine_provider = yield if block_given?
-                        
+
       myself.machine = create_machine(:machine, machine_provider, machine_config)
     end
   end
-       
+
   #-----------------------------------------------------------------------------
   # Checks
-  
+
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
-  
+
   def api_user=api_user
     myself[:api_user] = api_user
   end
-  
+
   def api_user
     myself[:api_user]
   end
-  
+
   #---
-  
+
   def api_key=api_key
     myself[:api_key] = api_key
   end
-  
+
   def api_key
     myself[:api_key]
   end
-  
+
   #---
-  
+
   def auth_url=auth_url
     myself[:auth_url] = auth_url
   end
-  
+
   def auth_url
     myself[:auth_url]
   end
-  
+
   #---
-  
+
   def connection_options=options
     myself[:connection_options] = options
   end
-  
+
   def connection_options
     myself[:connection_options]
   end
-  
+
   #---
-  
+
   def region_info
-    @region_info  
+    @region_info
   end
-  
+
   def regions
     @region_info.keys
   end
-  
+
   def region=region
     myself[:region] = region
   end
-  
+
   def region
     if region = myself[:region]
       region
@@ -92,44 +92,44 @@ class Fog < Nucleon.plugin_class(:CORL, :node)
       first_region
     end
   end
-  
+
   #-----------------------------------------------------------------------------
   # Settings groups
-    
+
   def machine_config
-    super do |config|        
+    super do |config|
       config[:connection_options] = connection_options if connection_options
       yield(config) if block_given?
     end
   end
-  
+
   #---
-  
+
   def key_config
     { :private_key_path => private_key, :public_key_path  => public_key }
   end
-  
+
   #---
-  
+
   def exec_options(name, options = {})
     extended_config(name, options).export
   end
-  
+
   #-----------------------------------------------------------------------------
   # Node operations
-  
+
   def create(options = {})
     super do |op, config|
       if op == :config
         config.import(exec_options(:create))
         config.defaults(key_config)
       end
-      yield(op, config) if block_given?      
+      yield(op, config) if block_given?
     end
   end
-  
+
   #---
-  
+
   def download(remote_path, local_path, options = {})
     super do |op, config|
       if op == :config
@@ -138,9 +138,9 @@ class Fog < Nucleon.plugin_class(:CORL, :node)
       yield(op, config) if block_given?
     end
   end
-  
+
   #---
-  
+
   def upload(local_path, remote_path, options = {})
     super do |op, config|
       if op == :config
@@ -149,9 +149,9 @@ class Fog < Nucleon.plugin_class(:CORL, :node)
       yield(op, config) if block_given?
     end
   end
-  
+
   #---
-  
+
   def exec(options = {})
     super do |op, config|
       if op == :config
@@ -160,9 +160,9 @@ class Fog < Nucleon.plugin_class(:CORL, :node)
       yield(op, config) if block_given?
     end
   end
-  
+
   #---
-    
+
   def start(options = {})
     super do |op, config|
       if op == :config
@@ -172,9 +172,9 @@ class Fog < Nucleon.plugin_class(:CORL, :node)
       yield(op, config) if block_given?
     end
   end
-  
+
   #---
-    
+
   def reload(options = {})
     super do |op, config|
       if op == :config
@@ -183,9 +183,9 @@ class Fog < Nucleon.plugin_class(:CORL, :node)
       yield(op, config) if block_given?
     end
   end
-  
+
   #---
-  
+
   def create_image(options = {})
     super do |op, config|
       if op == :config
@@ -194,9 +194,9 @@ class Fog < Nucleon.plugin_class(:CORL, :node)
       yield(op, config) if block_given?
     end
   end
-  
+
   #---
-    
+
   def stop(options = {})
     super do |op, config|
       if op == :config
@@ -205,10 +205,10 @@ class Fog < Nucleon.plugin_class(:CORL, :node)
       yield(op, config) if block_given?
     end
   end
-  
+
   #---
 
-  def destroy(options = {})    
+  def destroy(options = {})
     super do |op, config|
       if op == :config
         config.import(exec_options(:destroy))
@@ -216,10 +216,10 @@ class Fog < Nucleon.plugin_class(:CORL, :node)
       yield(op, config) if block_given?
     end
   end
-  
+
   #-----------------------------------------------------------------------------
   # Utilities
-  
+
   def filter_output(type, data)
     super
   end

data/lib/core/plugin/node.rb

@@ -986,7 +986,7 @@ class Node < Nucleon.plugin_class(:nucleon, :base)
     user_home  = config[:home]
     auth_files = config.get_array(:auth_files)
 
-    reboot    = config.get(:reboot, false)
+    reboot    = config.get(:reboot, true)
     dev_build = config.get(:dev_build, false)
 
     codes :local_path_not_found,

data/lib/corl.rb

@@ -4,14 +4,14 @@
 #
 # built on Nucleon (github.com/coralnexus/nucleon)
 #
-# A framework that provides a simple foundation for growing organically in 
+# A framework that provides a simple foundation for growing organically in
 # the cloud.
 #
 # Author::    Adrian Webb (mailto:adrian.webb@coralnexus.com)
 # License::   GPLv3
 
 #-------------------------------------------------------------------------------
-# Top level properties 
+# Top level properties
 
 lib_dir           = File.dirname(__FILE__)
 core_dir          = File.join(lib_dir, 'core')
@@ -23,7 +23,7 @@ macro_dir         = File.join(mixin_dir, 'macro')
 util_dir          = File.join(core_dir, 'util')
 mod_dir           = File.join(core_dir, 'mod')
 vagrant_dir       = File.join(core_dir, 'vagrant')
- 
+
 #-------------------------------------------------------------------------------
 # CORL requirements
 
@@ -69,7 +69,7 @@ end
 #---
 
 # Include CORL utilities
-[ :puppet ].each do |name| 
+[ :puppet ].each do |name|
   nucleon_require(util_dir, name)
 end
 
@@ -82,14 +82,14 @@ nucleon_require(core_dir, :errors)
 module Nucleon
   class Config
     extend Mixin::Lookup
-    include Mixin::Lookup  
+    include Mixin::Lookup
   end
-  
+
   #---
-  
+
   module Plugin
     class Base
-      extend Mixin::Macro::NetworkSettings    
+      extend Mixin::Macro::NetworkSettings
     end
   end
 end
@@ -115,19 +115,19 @@ end
 # CORL interface
 
 module CORL
- 
+
   def self.VERSION
-    File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))  
+    File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
   end
-  
+
   #-----------------------------------------------------------------------------
   # CORL initialization
-  
+
   def self.lib_path
     File.dirname(__FILE__)
   end
-  
-  #---  
+
+  #---
 
   reload(true, :corl) do |op, manager|
     if op == :define

data/lib/nucleon/action/node/bootstrap.rb

@@ -19,7 +19,7 @@ class Bootstrap < Nucleon.plugin_class(:nucleon, :cloud_action)
       register_directory :bootstrap_path, File.join(CORL.lib_path, '..', 'bootstrap')
       register_files :auth_files
 
-      register_bool :reboot, false
+      register_bool :reboot, true
       register_bool :dev_build, false
 
       register_str :home_env_var, 'HOME'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: corl
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Adrian Webb
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-12-03 00:00:00 Z
+date: 2014-12-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nucleon
@@ -31,99 +31,89 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "1.25"
+        version: "1.23"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fog-rackspace
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: unf
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "0.1"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: facter
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2.3"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: hiera
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "1.3"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: puppet
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "3.7"
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: bundler
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "1.7"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "2.0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "3.1"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rdoc
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: "3.12"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 description: Framework that provides a simple foundation for growing organically in the cloud
 email: adrian.webb@coralnexus.com
 executables: 
@@ -157,7 +147,6 @@ files:
 - bootstrap/os/ubuntu/01_git.sh
 - bootstrap/os/ubuntu/02_editor.sh
 - bootstrap/os/ubuntu/05_ruby.sh
-- bootstrap/os/ubuntu/06_puppet.sh
 - bootstrap/os/ubuntu/09_nucleon.sh
 - bootstrap/os/ubuntu/10_corl.sh
 - corl.gemspec
@@ -184,6 +173,7 @@ files:
 - lib/core/mixin/machine/ssh.rb
 - lib/core/mixin/macro/network_settings.rb
 - lib/core/mod/fog_aws_server.rb
+- lib/core/mod/fog_rackspace_server.rb
 - lib/core/mod/hiera_backend.rb
 - lib/core/plugin/agent.rb
 - lib/core/plugin/builder.rb