corl 0.4.18 → 0.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2998050a434194e1bcaf8faad1bb77b6efb0f548
-  data.tar.gz: 07b3e8d66462f5aa0addb0a817e5dd3d2ba78da4
+  metadata.gz: d23402e2a5b767aa38faccd1e9a9e94669c58985
+  data.tar.gz: 0154ea26bcc292aaadba6366a73e6dce47ba1cb6
 SHA512:
-  metadata.gz: b190cb7d2bc0263fccb454f14edcc2fc642b14114ab69667d3cc604aeb598b11aadbec889cacd0355a8c11e099003b206ac0afc26000dcf510e6aa7610208341
-  data.tar.gz: 99bda0a984451b7713b39b516f0d8c5f8d38b9e6c1fbf4d338b64ae75e5a820210501ad5a9f4a39113ccd8252f80e2e7b7846a7ed71a39955f788538050ae2a7
+  metadata.gz: 7f56aef4866083bbf819dd2c318aacb41bf05b4cedb24853f7ac08b4142b34c35db55fb67b227e211e038b6384a9d7772e03828b2ee9566facf2bd1cf0fb79aa
+  data.tar.gz: 7ac1d4d5a7203462bb045b7a38151c98a4d20c1ae845da4de603ad1010b4b1838f0551fce93eef7bfed736338e920dabbc1b98d9bef57f2d2a341fbcd377d02d

data/Gemfile.lock

@@ -36,7 +36,7 @@ GIT
 PATH
   remote: .
   specs:
-    corl (0.4.18)
+    corl (0.4.19)
       facter (~> 1.7)
       fog (~> 1.20)
       hiera (~> 1.3)

data/Rakefile

@@ -34,7 +34,7 @@ Jeweler::Tasks.new do |gem|
   gem.authors               = ["Adrian Webb"]
   gem.summary               = %Q{Cluster Orchestration and Research Library}
   gem.description           = %Q{Framework that provides a simple foundation for growing organically in the cloud} 
-  gem.required_ruby_version = '>= 2.0'
+  gem.required_ruby_version = '>= 1.9.1'
   gem.has_rdoc              = true
   gem.rdoc_options << '--title' << 'Cluster Orchestration and Research Library' <<
                       '--main' << 'README.rdoc' <<

data/VERSION

@@ -1 +1 @@
-0.4.18
+0.4.19

data/bootstrap/os/ubuntu/00_base.sh

@@ -12,6 +12,8 @@ echo "nameserver 208.67.222.222" | tee /etc/resolvconf/resolv.conf.d/base > /dev
 
 # Update system packages
 apt-get update || exit 4
+apt-get -y dist-upgrade || exit 5
 
 # Install basic build packages.
-apt-get -y install build-essential python-software-properties curl || exit 5
+apt-get -y install build-essential libnl-dev libpopt-dev libssl-dev libcurl4-openssl-dev libxslt-dev libxml2-dev || exit 6
+apt-get -y install python-software-properties unzip curl || exit 7

data/bootstrap/os/ubuntu/02-editor.sh

@@ -2,7 +2,7 @@
 #-------------------------------------------------------------------------------
 
 # Install Vim editor.
-apt-get -y install vim vim-scripts vim-puppet || exit 20
+apt-get -y install vim || exit 20
 
 # Set Vim options
 ( cat <<'EOP'

data/bootstrap/os/ubuntu/05_ruby.sh

@@ -2,15 +2,10 @@
 #-------------------------------------------------------------------------------
 
 # Install Ruby.
-add-apt-repository -y ppa:brightbox/ruby-ng-experimental 2>&1 || exit 51
-apt-get update || exit 52
-
-apt-get -y install ruby2.0 ruby2.0-dev || exit 53
-update-alternatives --set ruby /usr/bin/ruby2.0 || exit 54
-update-alternatives --set gem /usr/bin/gem2.0 || exit 55
+apt-get -y install ruby2.0 ruby2.0-dev ruby1.9.1-dev || exit 50
 
 # Set Gem options
 ( cat <<'EOP'
 gem: --no-rdoc --no-ri 
 EOP
-) > "$HOME/.gemrc" || exit 56
+) > "$HOME/.gemrc" || exit 51

data/bootstrap/os/ubuntu/06_puppet.sh

@@ -5,15 +5,15 @@
 apt-key adv --recv-key --keyserver pgp.mit.edu 4BD6EC30 2>&1 || exit 60
 
 ( cat <<'EOP'
-deb http://apt.puppetlabs.com precise main dependencies
-deb-src http://apt.puppetlabs.com precise main dependencies
+deb http://apt.puppetlabs.com trusty main dependencies
+deb-src http://apt.puppetlabs.com trusty main dependencies
 EOP
 ) > /etc/apt/sources.list.d/puppet.list || exit 61
 chmod 0644 /etc/apt/sources.list.d/puppet.list || exit 62
 
 # Install Puppet
 apt-get -y update || exit 63
-apt-get -y install puppet-common=3.4.3-1puppetlabs1 puppet=3.4.3-1puppetlabs1 || exit 64
+apt-get -y install puppet-common=3.4.3-1 puppet=3.4.3-1 || exit 64
 
 # Set up Hiera configuration
 mkdir -p /var/corl/config || exit 65

data/bootstrap/os/ubuntu/10_corl.sh

@@ -3,12 +3,17 @@
 
 # For now we install CORL through the repo for testing purposes
 
+# Install this dependency separately so the damn thing will build.
+# I REALLY dislike Nokogiri.
+# TODO: Figure out why this is happening?
+gem install nokogiri || exit 100
+
 # Install the corl gem
 rm -Rf /tmp/corl
-mkdir /tmp/corl || exit 100
+mkdir /tmp/corl || exit 101
 
-cd /tmp/corl || exit 101
-git clone --branch 0.4 git://github.com/coralnexus/corl.git /tmp/corl || exit 102
-git submodule update --init --recursive || exit 103
-gem build /tmp/corl/corl.gemspec || exit 104
-gem install /tmp/corl/corl-*.gem || exit 105
+cd /tmp/corl || exit 102
+git clone --branch 0.4 git://github.com/coralnexus/corl.git /tmp/corl || exit 103
+git submodule update --init --recursive || exit 104
+gem build /tmp/corl/corl.gemspec || exit 105
+gem install /tmp/corl/corl-*.gem || exit 106

data/corl.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: corl 0.4.18 ruby lib
+# stub: corl 0.4.19 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.18"
+  s.version = "0.4.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Adrian Webb"]
-  s.date = "2014-04-22"
+  s.date = "2014-04-24"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -146,7 +146,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/coralnexus/corl"
   s.licenses = ["GPLv3"]
   s.rdoc_options = ["--title", "Cluster Orchestration and Research Library", "--main", "README.rdoc", "--line-numbers"]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.0")
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.1")
   s.rubyforge_project = "corl"
   s.rubygems_version = "2.2.2"
   s.summary = "Cluster Orchestration and Research Library"

data/lib/CORL/action/seed.rb

@@ -18,6 +18,8 @@ class Seed < Plugin::CloudAction
       
       register :project_branch, :str, 'master'
       register :project_reference, :str, nil do |value|
+        next true if value.nil?
+        
         value           = value.to_sym
         project_plugins = CORL.loaded_plugins(:project)
         

data/lib/CORL/action/spawn.rb

@@ -13,6 +13,10 @@ class Spawn < Plugin::CloudAction
       codes :key_failure,
             :node_create_failure
       
+      register :bootstrap, :bool, true
+      register :seed, :bool, true
+      register :provision, :bool, true
+      
       register :groups, :array, []      
       register :region, :str, nil
       register :machine_type, :str, nil

data/lib/CORL/configuration/file.rb

@@ -12,15 +12,6 @@ class File < CORL.plugin_class(:configuration)
       _set(:router, Config.new)
     end
   end
-  
-  #--- 
-  
-  def self.finalize(file_name)
-    proc do
-      logger.debug("Finalizing file: #{file_name}")
-      Util::Disk.close(file_name)
-    end
-  end
     
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
@@ -318,7 +309,6 @@ class File < CORL.plugin_class(:configuration)
           :info     => info,
           :file     => file
         }
-        ObjectSpace.define_finalizer(myself, myself.class.finalize(file))
       else
         logger.info("Configuration file #{file} does not exist")   
       end  

data/lib/CORL/node/vagrant.rb

@@ -61,6 +61,26 @@ class Vagrant < CORL.plugin_class(:node)
     hash(myself[:shares])
   end
   
+  #---
+  
+  def build_time=time
+    set_cache_setting(:build, time)
+  end
+  
+  def build_time
+    cache_setting(:build, nil)
+  end
+  
+  #---
+  
+  def bootstrap_script=bootstrap
+    set_cache_setting(:bootstrap, bootstrap)
+  end
+  
+  def bootstrap_script
+    cache_setting(:bootstrap, nil)  
+  end
+  
   #-----------------------------------------------------------------------------
   # Settings groups
     
@@ -82,6 +102,12 @@ class Vagrant < CORL.plugin_class(:node)
   #-----------------------------------------------------------------------------
   # Node operations
   
+  def build(options = {})
+    super(Config.ensure(options).import({ :save => false }))  
+  end
+  
+  #---
+  
   def create(options = {})
     super do |op, config|
       if op == :config

data/lib/core/plugin/network.rb

@@ -14,6 +14,8 @@ class Network < CORL.plugin_class(:base)
     logger.info("Initializing sub configuration from source with: #{myself._export.inspect}")
     myself.config = CORL.configuration(Config.new(myself._export).import({ :autosave => false, :create => false })) unless reload
     
+    config.delete(:directory) # TODO: Figure out what to do with this??
+    
     ignore('build')
   end
   
@@ -282,12 +284,15 @@ class Network < CORL.plugin_class(:base)
     config  = Config.ensure(options)
     success = true
     
-    bootstrap = config.delete(:bootstrap, false)
-    seed      = config.delete(:seed, false)
+    bootstrap_requested = config.has_key?(:bootstrap)
+    bootstrap           = config.delete(:bootstrap, false)
+    
+    seed_requested      = config.has_key?(:seed)
+    seed                = config.delete(:seed, false)
     
     unless node.cache_setting(:initialized)
-      bootstrap = true
-      seed      = true
+      bootstrap = true unless bootstrap_requested
+      seed      = true unless seed_requested
     end
        
     provision = config.delete(:provision, true)

data/lib/core/plugin/node.rb

@@ -313,10 +313,24 @@ class Node < CORL.plugin_class(:base)
   
   #---
   
+  def build_time=time
+    myself[:build] = time
+  end
+  
   def build_time
     myself[:build]
   end
   
+  #---
+  
+  def bootstrap_script=bootstrap
+    myself[:bootstrap] = bootstrap
+  end
+  
+  def bootstrap_script
+    myself[:bootstrap]  
+  end
+  
   #-----------------------------------------------------------------------------
   # Settings groups
   
@@ -349,10 +363,10 @@ class Node < CORL.plugin_class(:base)
       end
     end
     
-    if success
+    if success && config.delete(:save, true)
       ui.success("Saving successful build")
       
-      myself[:build] = Time.now.to_s
+      myself.build_time = Time.now.to_s
     
       success = save(extended_config(:build, {
         :message => config.get(:message, "Built #{plugin_provider} node: #{plugin_name}"),
@@ -798,7 +812,7 @@ class Node < CORL.plugin_class(:base)
           if status == code.success
             remote_script = File.join(remote_bootstrap_path, bootstrap_init)
             
-            myself[:bootstrap] = remote_script
+            myself.bootstrap_script = remote_script
             
             result = command("HOSTNAME='#{hostname}' #{remote_script}", { :as_admin => true }) do |op, data|
               yield("exec_#{op}".to_sym, data) if block_given?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.19
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon
@@ -339,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="