corl 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc7a511170c0e91c68ae57a550072a617f5b4033
-  data.tar.gz: 31ff4a2fbcc4b93ebff9bfe1e0ee00835f97c920
+  metadata.gz: d7aa748974143ba8a58a9d80fb344ccb4156060d
+  data.tar.gz: 8c3937130f2468a5462adc2fdb1171c730762387
 SHA512:
-  metadata.gz: e53ad83f7cf959433903538e80e913aca1c03450f23ab77a01f8d272a3076db8df60407925995fe4f3431a83102181e90c7112d21037146298d235f0721a9807
-  data.tar.gz: cc31911b9991ec5f67cd8b7779a2bdc8866e95c61f49024c1668da09bf6b7d3fa40127b3c9b6bad8a7c7e5128bf25a5f0ddd62a957777d29c84fc6f67a8ccdb6
+  metadata.gz: 333a02982ceb698acec7f3d5c2064b327b783cefe0315e2d1b4eb6390f88988134c9d9a49c496bea297eb5dd946f96bd86099d41eb80ded6fcdfaf07fc36606d
+  data.tar.gz: 9f086aca3037fa7c37eca60dc406d0167b0cacfd5b1577718ced41c36737500f58955eeb05cb9222f625ba996a3c64924fe69386a46330495b56fe6c043960c7

data/VERSION

@@ -1 +1 @@
-0.5.13
+0.5.14

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.5.13 ruby lib
+# stub: corl 0.5.14 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.5.13"
+  s.version = "0.5.14"
 
   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 = "2015-02-03"
+  s.date = "2015-02-09"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]

data/lib/core/vagrant/config.rb

@@ -269,27 +269,6 @@ module Config
           machine.vm.provider provider do |interface, override|
             render("  node.vm.provider '#{provider}' do |provider, override|  # for #{node.hostname}") unless already_processed[provider]
 
-            if box || box_url
-              if provider != :docker
-                if box && box_url
-                  render("    override.vm.box = %property", { :property => box }) unless already_processed[provider]
-                  override.vm.box = box
-
-                  render("    override.vm.box_url = %property", { :property => box_url }) unless already_processed[provider]
-                  override.vm.box_url = box_url
-                end
-              else
-                if box_file
-                  render("    provider.build_dir = %property", { :property => box_file }) unless already_processed[provider]
-                  interface.build_dir = box_file
-                else
-                  render("    provider.image = %property", { :property => box }) unless already_processed[provider]
-                  interface.image = box
-                end
-              end
-              render("\n")
-            end
-
             if info.has_key?(:private_network)
               network_options = info[:private_network].is_a?(Hash) ? info[:private_network] : { :ip => info[:private_network] }
 
@@ -338,6 +317,27 @@ module Config
               end
             end
 
+            if box || box_url
+              if provider != :docker
+                if box && box_url
+                  render("    override.vm.box = %property", { :property => box }) unless already_processed[provider]
+                  override.vm.box = box
+
+                  render("    override.vm.box_url = %property", { :property => box_url }) unless already_processed[provider]
+                  override.vm.box_url = box_url
+                end
+              else
+                if box_file
+                  render("    provider.build_dir = %property", { :property => box_file }) unless already_processed[provider]
+                  interface.build_dir = box_file
+                else
+                  render("    provider.image = %property", { :property => box }) unless already_processed[provider]
+                  interface.image = box
+                end
+              end
+              render("\n")
+            end
+
             # Server shares
             unless configure_shares(node, provider, override, already_processed[provider], '    ')
               raise "Configuration of Vagrant shares failed: #{node_name}"

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

@@ -18,7 +18,7 @@ This function performs a lookup for a variable value in various locations follow
 If no value is found in the defined sources, it does not include any classes.
     EOS
 ) do |args|
-    
+
     CORL.run do
       raise(Puppet::ParseError, "corl_include(): Define at least the variable name " +
         "given (#{args.size} for 1)") if args.size < 1
@@ -26,11 +26,13 @@ If no value is found in the defined sources, it does not include any classes.
       var_name    = args[0]
       parameters  = ( args.size > 1 ? args[1] : {} )
       options     = ( args.size > 2 ? args[2] : {} )
-      
+
       module_name = parent_module_name
       contexts    = [ :include, var_name ]
-      
+
       default_options = {
+        :node            => CORL::Provisioner::Puppetnode.node,
+        :provisioner     => :puppetnode,
         :hiera_scope     => self,
         :puppet_scope    => self,
         :search          => 'core::default',
@@ -38,13 +40,13 @@ If no value is found in the defined sources, it does not include any classes.
         :merge           => true,
         :undefined_value => :undef
       }
-      
+
       if module_name
-        config = CORL::Config.init(options, contexts, module_name, default_options)  
+        config = CORL::Config.init(options, contexts, module_name, default_options)
       else
         config = CORL::Config.init_flat(options, contexts, default_options)
       end
-      
+
       CORL::Util::Puppet.include(var_name, parameters, config)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - Adrian Webb
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon