corl 0.4.13 → 0.4.14

data/VERSION

@@ -1 +1 @@
-0.4.13
+0.4.14

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

@@ -0,0 +1,26 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------
+
+# Install Vim editor.
+apt-get -y install vim vim-scripts vim-puppet || exit 20
+
+# Set Vim options
+( cat <<'EOP'
+set tabstop=2
+set shiftwidth=2
+set expandtab
+set smarttab
+set number
+set showmatch
+set hlsearch
+set incsearch
+set smartcase
+set backspace=2
+set autoindent
+set textwidth=79
+set ruler
+set background=dark
+filetype plugin indent on
+syntax on
+EOP
+) > "$HOME/.vimrc" || exit 21

data/corl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.13"
+  s.version = "0.4.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "bootstrap/lib/shell/validators.sh",
     "bootstrap/os/ubuntu/00_base.sh",
     "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",

data/lib/CORL/provisioner/puppetnode.rb

@@ -72,11 +72,17 @@ class Puppetnode < CORL.plugin_class(:provisioner)
     # environment without phantom empty environment issues.
     
     Puppet[:default_file_terminus] = :file_server
-    Puppet[:graph] = true
       
     node = get_node    
     Puppet[:node_name_value] = id.to_s
     
+    unless profiles.empty?
+      modulepath = profiles.collect do |profile|
+        File.join(build_directory, locations[:module][profile.to_sym])
+      end
+      Puppet[:modulepath] = array(modulepath).join(File::PATH_SEPARATOR)
+    end
+    
     if manifest = gateway
       if manifest.match(/^packages\/.*/)
         manifest = File.join(build_directory, locations[:build], manifest)
@@ -86,13 +92,6 @@ class Puppetnode < CORL.plugin_class(:provisioner)
       Puppet[:manifest] = manifest   
     end
     
-    unless profiles.empty?
-      modulepath = profiles.collect do |profile|
-        File.join(build_directory, locations[:module][profile.to_sym])
-      end
-      Puppet[:modulepath] = array(modulepath).join(File::PATH_SEPARATOR)
-    end
-    
     @compiler = Puppet::Parser::Compiler.new(node)
     register
     node

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon
-  requirement: &21571420 !ruby/object:Gem::Requirement
+  requirement: &16027460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *21571420
+  version_requirements: *16027460
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &21608600 !ruby/object:Gem::Requirement
+  requirement: &16026380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.20'
   type: :runtime
   prerelease: false
-  version_requirements: *21608600
+  version_requirements: *16026380
 - !ruby/object:Gem::Dependency
   name: unf
-  requirement: &21608040 !ruby/object:Gem::Requirement
+  requirement: &16025500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *21608040
+  version_requirements: *16025500
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &21607540 !ruby/object:Gem::Requirement
+  requirement: &16025000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *21607540
+  version_requirements: *16025000
 - !ruby/object:Gem::Dependency
   name: hiera
-  requirement: &21607040 !ruby/object:Gem::Requirement
+  requirement: &16024440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *21607040
+  version_requirements: *16024440
 - !ruby/object:Gem::Dependency
   name: puppet
-  requirement: &21606500 !ruby/object:Gem::Requirement
+  requirement: &16023660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *21606500
+  version_requirements: *16023660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &21605960 !ruby/object:Gem::Requirement
+  requirement: &16022220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *21605960
+  version_requirements: *16022220
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &21605440 !ruby/object:Gem::Requirement
+  requirement: &16021180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *21605440
+  version_requirements: *16021180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21604900 !ruby/object:Gem::Requirement
+  requirement: &16086200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *21604900
+  version_requirements: *16086200
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21604280 !ruby/object:Gem::Requirement
+  requirement: &16085200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *21604280
+  version_requirements: *16085200
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &21603720 !ruby/object:Gem::Requirement
+  requirement: &16084640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *21603720
+  version_requirements: *16084640
 description: Framework that provides a simple foundation for growing organically in
   the cloud
 email: adrian.webb@coralnexus.com
@@ -162,6 +162,7 @@ files:
 - bootstrap/lib/shell/validators.sh
 - bootstrap/os/ubuntu/00_base.sh
 - 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