corl 0.4.16 → 0.4.17

data/lib/core/vagrant/plugins.rb

@@ -9,13 +9,19 @@ class Plugin < ::Vagrant.plugin('2')
   
   name '[C]oral [O]rchestration and [R]esearch [L]ibrary'
   description 'The `corl` plugin provides an easy way to develop and test CORL networks locally from within Vagrant.'
-      
-  @@command_dir     = File.join(File.dirname(__FILE__), 'commands')
-  @@provisioner_dir = File.join(File.dirname(__FILE__), 'provisioner') 
+  
+  @@directory       = File.dirname(__FILE__) 
+  @@action_dir      = File.join(@@directory, 'actions')   
+  @@command_dir     = File.join(@@directory, 'commands')
+  @@provisioner_dir = File.join(@@directory, 'provisioner')
+  
+  #--- 
+  
+  nucleon_require(@@directory, :action)
+  nucleon_require(@@command_dir, :launcher)  
 
   # Commands (only one, which launches Nucleon actions)
-  command(:corl) do
-    nucleon_require(@@command_dir, :launcher)
+  command(:corl) do    
     Command::Launcher # Meta command for action launcher
   end
       
@@ -28,6 +34,22 @@ class Plugin < ::Vagrant.plugin('2')
     nucleon_require(@@provisioner_dir, :provisioner)
     Provisioner::CORL
   end
+  
+  # Action hooks
+  action_hook 'init-keys', :machine_action_up do |hook|
+    nucleon_require(@@action_dir, :init_keys)
+    hook.after Vagrant::Action::Builtin::WaitForCommunicator, Action::InitKeys
+  end
+  
+  action_hook 'create-shares', :machine_action_up do |hook|
+    nucleon_require(@@action_dir, :create_shares)
+    hook.after Action::InitKeys, Action::CreateShares
+  end
+  
+  action_hook 'delete-cache', :machine_action_destroy do |hook|
+    nucleon_require(@@action_dir, :delete_cache)
+    hook.after Vagrant::Action::Builtin::ProvisionerCleanup, Action::DeleteCache
+  end
 end
 end
 end

data/lib/core/vagrant/provisioner/config.rb

@@ -9,31 +9,70 @@ class CORL < ::Vagrant.plugin("2", :config)
 
   def initialize
     super
-    @network_path = UNSET_VALUE
-    @network      = UNSET_VALUE
-    @node         = UNSET_VALUE
+    @network           = UNSET_VALUE
+    @node              = UNSET_VALUE
+    
+    @force_updates     = false
+    @user_home         = UNSET_VALUE
+    @user_home_env_var = UNSET_VALUE
+    
+    @root_user         = UNSET_VALUE
+    @root_home         = UNSET_VALUE
+    
+    @bootstrap         = false
+    @bootstrap_path    = UNSET_VALUE
+    @bootstrap_glob    = UNSET_VALUE
+    @bootstrap_init    = UNSET_VALUE
+    @auth_files        = UNSET_VALUE
+    
+    @seed              = false
+    @project_reference = UNSET_VALUE
+    @project_branch    = UNSET_VALUE
+    
+    @provision         = true
+    @dry_run           = false
   end
   
   #---
   
   def finalize!
     super
+    @user_home         = nil if @user_home == UNSET_VALUE
+    @user_home_env_var = nil if @user_home_env_var == UNSET_VALUE
+    
+    @root_user         = nil if @root_user == UNSET_VALUE
+    @root_home         = nil if @root_home == UNSET_VALUE
+    
+    @bootstrap_path    = nil if @bootstrap_path == UNSET_VALUE
+    @bootstrap_glob    = nil if @bootstrap_glob == UNSET_VALUE
+    @bootstrap_init    = nil if @bootstrap_init == UNSET_VALUE
+    @auth_files        = nil if @auth_files == UNSET_VALUE
+    
+    @project_reference = nil if @project_reference == UNSET_VALUE
+    @project_branch    = nil if @project_branch == UNSET_VALUE
   end
   
   #-----------------------------------------------------------------------------
   # Property accessor / modifiers
   
-  attr_accessor :network_path, :network, :node
+  attr_accessor :network, :node  
+  attr_accessor :force_updates, :user_home, :user_home_env_var, :root_user, :root_home
+  
+  attr_accessor :bootstrap, :bootstrap_path, :bootstrap_glob, :bootstrap_init, :auth_files 
+  attr_accessor :seed, :project_reference, :project_branch
+  attr_accessor :provision, :dry_run
   
   #-----------------------------------------------------------------------------
   # Validation
 
   def validate(machine)
-    errors = _detected_errors    
+    errors = _detected_errors
+    
+    # TODO: Validation (with action config validators)
+        
     { "CORL provisioner" => errors }
   end
 end
 end
 end
 end
-

data/lib/core/vagrant/provisioner/provisioner.rb

@@ -21,25 +21,51 @@ class CORL < ::Vagrant.plugin("2", :provisioner)
 
   def provision
     @machine.communicate.tap do |comm|
-      network_path = config.network_path
-      network      = config.network
-      node         = config.node
-      
-      # Make sure the CORL network directory is properly set up
-      comm.sudo("rm -Rf #{network_path}")
-      comm.sudo("ln -s /vagrant #{network_path}")
+      unless ::CORL::Vagrant.command
+        # Hackish solution to ensure our code has access to Vagrant machines.
+        # This serves as a Vagrant VM manager.
+        ::CORL::Vagrant.command = Command::Launcher.new([], @machine.env)
+      end
+    
+      network = config.network
+      node    = config.node
       
-      # Make sure the CORL SSH keys are allowed
-      if node.public_key
-        ssh_key = ::CORL::Util::Disk.read(node.public_key)
-        
-        if ssh_key && ! ssh_key.empty?
-          comm.execute("echo '#{ssh_key}' > \$HOME/.ssh/authorized_keys")
-          node.set_cache_setting(:use_private_key, true)
-        end
+      if network && node
+        # Provision the server
+        network.init_node(node, clean(::CORL.config(:vagrant_node_init, {
+          :force             => config.force_updates,
+          :home              => config.user_home,
+          :home_env_var      => config.user_home_env_var,
+          :root_user         => config.root_user,
+          :root_home         => config.root_home,
+          :bootstrap         => config.bootstrap,
+          :bootstrap_path    => config.bootstrap_path,
+          :bootstrap_glob    => config.bootstrap_glob,
+          :bootstrap_init    => config.bootstrap_init,
+          :auth_files        => config.auth_files,
+          :seed              => config.seed,
+          :project_reference => config.project_reference,
+          :project_branch    => config.project_branch,
+          :provision         => config.provision,
+          :dry_run           => config.dry_run
+        }).export))
       end
     end
   end
+  
+  #-----------------------------------------------------------------------------
+  # Utilities
+  
+  def clean(options)
+    options.keys.each do |key|
+      value = options[key]
+      if value.nil?
+        options.delete(key)
+      end  
+    end
+    options  
+  end
+  protected :clean
 end
 end
 end

data/lib/corl.rb

@@ -15,6 +15,7 @@
 
 lib_dir          = File.dirname(__FILE__)
 core_dir         = File.join(lib_dir, 'core')
+mod_dir          = File.join(core_dir, 'mod')
 mixin_dir        = File.join(core_dir, 'mixin')
 mixin_action_dir = File.join(mixin_dir, 'action')
 macro_dir        = File.join(mixin_dir, 'macro')
@@ -27,10 +28,6 @@ vagrant_dir      = File.join(core_dir, 'vagrant')
 
 $:.unshift(lib_dir) unless $:.include?(lib_dir) || $:.include?(File.expand_path(lib_dir))
 
-#---
-  
-require 'rubygems'
-
 require 'nucleon_base'
 CORL = Nucleon
 
@@ -50,6 +47,11 @@ I18n.load_path << File.expand_path(File.join('..', 'locales', 'en.yml'), lib_dir
 #-------------------------------------------------------------------------------
 # Include CORL libraries
 
+# Monkey patches (depreciate as fast as possible)
+nucleon_require(mod_dir, :facter_loader)
+
+#---
+
 # Mixins for classes
 Dir.glob(File.join(mixin_dir, '*.rb')).each do |file|
   require file

data/lib/facter/custom_facts.rb

@@ -5,8 +5,8 @@ begin
   # Load network if it exists
   if CORL.admin?
     network_path   = Facter.value("corl_network")
-    network_config = CORL.config(:network, { :directory => network_path, :name => network_path })    
-    network        = CORL.network(CORL.sha1(network_config), network_config, :default)
+    network_config = CORL.config(:network, { :directory => network_path })    
+    network        = CORL.network(network_path, network_config, :default)
 
     if network && node = network.local_node
       Facter.add(:corl_provider) do

data/lib/puppet/parser/functions/render.rb

@@ -37,7 +37,10 @@ This function returns the string-ified form of a given value.
         config = CORL::Config.init_flat(options, contexts, default_options)
       end
       
-      value = CORL.template(config, provider).render(data)
+      template = CORL.template(config, provider)
+      value    = template.render(data)
+      
+      CORL.remove_plugin(template)
       
       if config.get(:debug, false)      
         CORL.ui.info("\n", { :prefix => false })

data/locales/en.yml

@@ -161,6 +161,9 @@ en:
       stop:
         start: |-
           Stopping %{provider} machine %{name}
+      reboot:
+        start: |-
+          Rebooting %{provider} machine %{name}
       destroy:
         start: |-
           Destroying %{provider} machine %{name}        
@@ -173,3 +176,15 @@ en:
             Whether or not to build the provisioner catalog without configuring the system (default %{default_value})
         start: |-
           Starting provision run
+    vagrant:
+      actions:
+        init_keys:
+          start: |-
+            Initializing CORL development keys...
+        create_shares:
+          start: |-
+            Creating CORL specific shares...
+        delete_cache:
+          start: |-
+            Clearing CORL cache for this machine...
+            

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.4.16
+  version: 0.4.17
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon
@@ -232,6 +232,7 @@ files:
 - lib/CORL/action/lookup.rb
 - lib/CORL/action/machines.rb
 - lib/CORL/action/provision.rb
+- lib/CORL/action/reboot.rb
 - lib/CORL/action/regions.rb
 - lib/CORL/action/seed.rb
 - lib/CORL/action/spawn.rb
@@ -257,6 +258,7 @@ files:
 - lib/core/mixin/action/keypair.rb
 - lib/core/mixin/lookup.rb
 - lib/core/mixin/macro/network_settings.rb
+- lib/core/mod/facter_loader.rb
 - lib/core/mod/fog_aws_server.rb
 - lib/core/mod/fog_rackspace_server.rb
 - lib/core/mod/hiera_backend.rb
@@ -272,6 +274,10 @@ files:
 - lib/core/util/puppet/resource.rb
 - lib/core/util/puppet/resource_group.rb
 - lib/core/vagrant/Vagrantfile
+- lib/core/vagrant/action.rb
+- lib/core/vagrant/actions/create_shares.rb
+- lib/core/vagrant/actions/delete_cache.rb
+- lib/core/vagrant/actions/init_keys.rb
 - lib/core/vagrant/commands/launcher.rb
 - lib/core/vagrant/config.rb
 - lib/core/vagrant/plugins.rb