corl 0.5.6 → 0.5.7

data/lib/core/vagrant/plugins.rb

@@ -6,26 +6,26 @@ end
 module VagrantPlugins
 module CORL
 class Plugin < ::Vagrant.plugin('2')
-  
-  name '[C]luster [O]rchestration and [R]esearch [L]ibrary'
+
+  name 'Coral Orchestration and Research Library'
   description 'The `corl` plugin provides an easy way to develop and test CORL networks locally from within Vagrant.'
-  
-  @@directory       = File.dirname(__FILE__) 
-  @@action_dir      = File.join(@@directory, 'actions')   
+
+  @@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, :config)
   nucleon_require(@@directory, :action)
-  nucleon_require(@@command_dir, :launcher)  
+  nucleon_require(@@command_dir, :launcher)
 
   # Commands (only one, which launches Nucleon actions)
-  command(:corl) do    
+  command(:corl) do
     Command::Launcher # Meta command for action launcher
   end
-      
+
   # Provisioner (we handle provisioning internally)
   config(:corl, :provisioner) do
     nucleon_require(@@provisioner_dir, :config)
@@ -35,20 +35,20 @@ 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
-  
+
   if ENV['CORL_LINK_NETWORK']
     action_hook 'link-network', :machine_action_up do |hook|
       nucleon_require(@@action_dir, :link_network)
       hook.after Action::InitKeys, Action::LinkNetwork
     end
   end
-  
+
   action_hook 'delete-cache', :machine_action_destroy do |hook|
     nucleon_require(@@action_dir, :delete_cache)
     hook.after Vagrant::Action::Builtin::ProvisionerCleanup, Action::DeleteCache

data/lib/corl.rb

@@ -1,6 +1,6 @@
 
 #*******************************************************************************
-# CORL (Cluster Orchestration and Research Library)
+# CORL (Coral Orchestration and Research Library)
 #
 # built on Nucleon (github.com/coralnexus/nucleon)
 #
@@ -8,7 +8,7 @@
 # the cloud.
 #
 # Author::    Adrian Webb (mailto:adrian.webb@coralnexus.com)
-# License::   GPLv3
+# License::   Apache License v2
 
 #-------------------------------------------------------------------------------
 # Top level properties
@@ -34,8 +34,6 @@ CORL = Nucleon
 
 require 'hiera'
 require 'facter'
-require 'puppet'
-require 'puppet/configurer'
 
 #-------------------------------------------------------------------------------
 # Localization
@@ -105,10 +103,8 @@ nucleon_require(core_dir, :build)
 nucleon_require(core_dir, :plugin)
 
 # Include Vagrant plugins (only include if running inside Vagrant)
-begin
-  require "vagrant"
+if defined?(Vagrant) == 'constant' && Vagrant.class == Module
   nucleon_require(vagrant_dir, :plugins)
-rescue LoadError
 end
 
 #-------------------------------------------------------------------------------

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

@@ -20,6 +20,8 @@ class Provision < Nucleon.plugin_class(:nucleon, :cloud_action)
 
       register_bool :build, false
       register_bool :dry_run, false
+      register_bool :check_profiles, false
+
       register_str :environment
     end
   end
@@ -45,7 +47,9 @@ class Provision < Nucleon.plugin_class(:nucleon, :cloud_action)
         end
 
         if CORL.admin?
-          info('start', { :provider => node.plugin_provider, :name => node.plugin_name })
+          unless settings[:check_profiles]
+            info('start', { :provider => node.plugin_provider, :name => node.plugin_name })
+          end
 
           if settings[:build] ||
             settings.has_key?(:environment) ||
@@ -64,12 +68,19 @@ class Provision < Nucleon.plugin_class(:nucleon, :cloud_action)
 
               collection.each do |name, provisioner|
                 if supported_profiles = provisioner.supported_profiles(node, profiles)
-                  profile_success = provisioner.provision(node, supported_profiles, settings)
-                  success         = false unless profile_success
+                  supported_profiles.each do |profile|
+                    info('profile', { :provider => yellow(provider), :profile => green(profile.to_s) })
+                  end
+                  unless settings[:check_profiles]
+                    profile_success = provisioner.provision(node, supported_profiles, settings)
+                    success         = false unless profile_success
+                  end
                 end
               end
             end
-            success('complete', { :provider => node.plugin_provider, :name => node.plugin_name, :time => Time.now.to_s }) if success
+            unless settings[:check_profiles]
+              success('complete', { :provider => node.plugin_provider, :name => node.plugin_name, :time => Time.now.to_s }) if success
+            end
             myself.status = code.provision_failure unless success
           end
         end

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

@@ -53,9 +53,9 @@ class Seed < Nucleon.plugin_class(:nucleon, :cloud_action)
 
         if keys = Util::SSH.generate.store
           if @project_info = project_class.translate_reference(settings[:project_reference], true)
-            project_info = Config.new(@project_info)
+            project_info = Config.new(@project_info, {}, true, false)
           else
-            project_info = Config.new({ :provider => :git })
+            project_info = Config.new({ :provider => :git }, {}, true, false)
           end
 
           project_class.clear_provider(network_path)

data/lib/nucleon/extension/vagrant.rb

@@ -0,0 +1,30 @@
+
+module Nucleon
+module Extension
+class Vagrant < Nucleon.plugin_class(:nucleon, :extension)
+
+  def network_new_node_config(config)
+    plugin   = config[:plugin]
+    provider = plugin.plugin_provider
+
+    if provider == :vagrant
+      image_name   = string(config.delete(:image))
+      machine_type = symbol(config.delete(:machine_type))
+      hostname     = string(config[:hostname])
+
+      public_ip    = string(config.delete(:public_ip))
+
+      case machine_type
+      when :docker
+        config.set([ :vm, :providers, :docker, :image ], image_name)
+      else
+        config.set([ :vm, :providers, machine_type, :private_network ], public_ip) if public_ip
+        config.set([ :vm, :providers, machine_type, :override, :vm, :box ], image_name)
+      end
+
+      config.set([ :vm, :providers, :docker, :create_args ], [ "--hostname='#{hostname}'" ])
+    end
+  end
+end
+end
+end

data/locales/en.yml

@@ -572,6 +572,8 @@ en:
               Provisioning %{provider} machine %{name}
             build: |-
               Building projects on %{provider} machine %{name}
+            profile: |-
+              Configured profile: %{provider}:::%{profile}
           success:
             complete: |-
               Provisioning of %{provider} machine %{name} completed at %{time}
@@ -714,6 +716,9 @@ en:
           Starting provision run
     vagrant:
       actions:
+        init_command:
+          start: |-
+            Initializing CORL command reference...
         init_keys:
           start: |-
             Initializing CORL development keys...