corl 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: fc0f4119fb65c2e0bcc38762618961f514b467d2
-  data.tar.gz: 806867a324bedab231f6aabea3afa2b0c6dde980
+  metadata.gz: 881f554ea8a48b043dcd9835c4cad50e4c2b51cb
+  data.tar.gz: 1d1f66df8ea0a33900f95727620e033b99037583
 SHA512: 
-  metadata.gz: 33a0ac51b370915ef9aa8fef62966b26c754db84ba6fe3d641a4187191ff592934fbf43f9e7586813735d39123a685aad552b7ab00f96b44ea61ffdb9912a078
-  data.tar.gz: 99025a53c6d3b7d75fc722c97b5fc0ed3b0b500e43cb026b5566a42330b79b7ffbb136a4dc5b7378fd381511ad1f3afb4c89e4a9ac453f04e7ba0f46596e8a42
+  metadata.gz: 2ee65aa1433b07072305fd0e1a4d5d09e61255a59d013df507329681b01f8826084b65cb15edb097e0547278d151fa7129b9f1b3e6c5b2562e64cce309cd878d
+  data.tar.gz: e49913e5c758ee2402edbde41061f0b70c1f2692a92c068a891c6f82d4a8e0035a1382455a4d5b14b07662ad9a0d3ab603440286ef1a4e2d4a7695bf94567aa8

data/Gemfile

@@ -2,8 +2,7 @@ source "http://rubygems.org"
 
 gem "nucleon", "~> 0.2", ">= 0.2.2", :github => 'coralnexus/nucleon', :branch => '0.2'
 
-gem "fog", "~> 1.25"
-gem "fog-rackspace", "~> 1.0"
+gem "fog", "~> 1.23"
 gem "unf", "~> 0.1"
 
 gem "facter", "~> 2.3"

data/Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: git://github.com/coralnexus/nucleon.git
-  revision: d6848f16f76b9cdd6fb6737bdac6b13f40d9e36e
+  revision: 49e01c377d42b1656181b34904f6d7927ecdace4
   branch: 0.2
   specs:
-    nucleon (0.2.3)
+    nucleon (0.2.4)
       celluloid (~> 0.16)
       childprocess (~> 0.5)
       deep_merge (~> 1.0)
@@ -72,10 +72,6 @@ GEM
       fog-core
       fog-xml
       nokogiri
-    fog-rackspace (1.0.4)
-      addressable
-      fog-core
-      fog-json
     fog-radosgw (0.0.3)
       fog-core (>= 1.21.0)
       fog-json
@@ -146,7 +142,7 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    octokit (3.6.0)
+    octokit (3.7.0)
       sawyer (~> 0.6.0, >= 0.5.3)
     opennebula (4.10.1)
       json
@@ -157,7 +153,7 @@ GEM
       hiera (~> 1.0)
       json_pure
     rack (1.5.2)
-    rake (10.4.1)
+    rake (10.4.2)
     rbvmomi (1.8.2)
       builder
       nokogiri (>= 1.4.1)
@@ -195,8 +191,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.7)
   facter (~> 2.3)
-  fog (~> 1.25)
-  fog-rackspace (~> 1.0)
+  fog (~> 1.23)
   hiera (~> 1.3)
   jeweler (~> 2.0)
   nucleon (~> 0.2, >= 0.2.2)!

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.4

data/bootstrap/bootstrap.sh

@@ -29,14 +29,11 @@ Systems initialized:
 * Ruby        - Ruby 2.1.x packages installed
               - Execution alternative configuration (if applicable)
               - Ruby Gem options initialized
-
-* Puppet      - PuppetLabs Apt source initialized (if applicable)
-              - Puppet and dependencies installed
-              - Hiera configured
          
 * Nucleon     - Nucleon gem and dependencies installed
 
 * CORL        - CORL gem and dependencies installed
+              - Hiera configured
 
 --------------------------------------------------------------------------------
 Tested under Ubuntu 12.04 and 14.04 LTS

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

@@ -18,6 +18,8 @@ function initialize_rvm_user()
   
   local PATH_ENTRY='PATH=${PATH}:/usr/local/rvm/bin'
   local RVMSUDO_SECURE_PATH="export rvmsudo_secure_path=1"
+  local SUDO_ALIAS="alias sudo=rvmsudo"
+  
   local SCRIPT_INCLUDE="[[ -s '/usr/local/rvm/scripts/rvm' ]] && source '/usr/local/rvm/scripts/rvm'"
 
   echo "3. Initializing RVM user ${USER_NAME} group and environment settings"
@@ -30,7 +32,11 @@ function initialize_rvm_user()
   if ! grep -Fxq "$RVMSUDO_SECURE_PATH" "$PROFILE_FILE" >>/tmp/ruby.config.log 2>&1
   then
     echo "$RVMSUDO_SECURE_PATH" >> "$PROFILE_FILE"
-  fi  
+  fi
+  if ! grep -Fxq "$SUDO_ALIAS" "$PROFILE_FILE" >>/tmp/ruby.config.log 2>&1
+  then
+    echo "$SUDO_ALIAS" >> "$PROFILE_FILE"
+  fi   
   if ! grep -Fxq "$SCRIPT_INCLUDE" "$BASHRC_FILE" >>/tmp/ruby.config.log 2>&1
   then
     echo "$SCRIPT_INCLUDE" >> "$BASHRC_FILE"
@@ -59,7 +65,7 @@ su - -c "rvm install rbx-2.3.0 --rubygems 2.4.2" root >>/tmp/ruby.config.log 2>&
 su - -c "rvm use rbx-2.3.0 --default" root >>/tmp/ruby.config.log 2>&1 || exit 54
 
 
-if [ ! -e "$HOME/.gemrc" ]
+if [ ! -e "/root/.gemrc" ]
 then
 echo "5. Adding an initial .gemrc configuration"
 
@@ -67,5 +73,5 @@ echo "5. Adding an initial .gemrc configuration"
 ( cat <<'EOP'
 gem: --no-rdoc --no-ri 
 EOP
-) > "$HOME/.gemrc" || exit 55
+) > "/root/.gemrc" || exit 55
 fi

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

@@ -3,7 +3,7 @@
 
 # Uninstall the CORL gem
 
-echo "1. Removing old versions of corl gem"
+echo "1. Removing old versions of CORL gem"
 su - -c "gem uninstall corl -x --force" root >/tmp/corl.uninstall.log 2>&1 || exit 101
 
 # Install the CORL gem
@@ -27,4 +27,28 @@ then
 else
   echo "2. Installing latest release of CORL"
   su - -c "gem install corl" root >/tmp/corl.install.log 2>&1 || exit 102
-fi
+fi
+
+# Set up Hiera configuration
+mkdir -p /var/corl/config || exit 108
+
+if [ ! -e /etc/hiera.yaml ]
+then
+echo "5. Configuring Hiera"
+  
+( cat <<'EOP'
+---
+:merge_behavior: deeper
+:backends:
+  - yaml
+  - json
+:yaml:
+  :datadir: /var/corl/config
+:json:
+  :datadir: /var/corl/config
+:hierarchy:
+  - common
+EOP
+) > /etc/hiera.yaml || exit 109
+chmod 0440 /etc/hiera.yaml || exit 110
+fi

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.3 ruby lib
+# stub: corl 0.5.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.5.3"
+  s.version = "0.5.4"
 
   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-12-03"
+  s.date = "2014-12-04"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -43,7 +43,6 @@ Gem::Specification.new do |s|
     "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",
     "bootstrap/os/ubuntu/10_corl.sh",
     "corl.gemspec",
@@ -70,6 +69,7 @@ Gem::Specification.new do |s|
     "lib/core/mixin/machine/ssh.rb",
     "lib/core/mixin/macro/network_settings.rb",
     "lib/core/mod/fog_aws_server.rb",
+    "lib/core/mod/fog_rackspace_server.rb",
     "lib/core/mod/hiera_backend.rb",
     "lib/core/plugin/agent.rb",
     "lib/core/plugin/builder.rb",
@@ -177,8 +177,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nucleon>, [">= 0.2.2", "~> 0.2"])
-      s.add_runtime_dependency(%q<fog>, ["~> 1.25"])
-      s.add_runtime_dependency(%q<fog-rackspace>, ["~> 1.0"])
+      s.add_runtime_dependency(%q<fog>, ["~> 1.23"])
       s.add_runtime_dependency(%q<unf>, ["~> 0.1"])
       s.add_runtime_dependency(%q<facter>, ["~> 2.3"])
       s.add_runtime_dependency(%q<hiera>, ["~> 1.3"])
@@ -189,8 +188,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
     else
       s.add_dependency(%q<nucleon>, [">= 0.2.2", "~> 0.2"])
-      s.add_dependency(%q<fog>, ["~> 1.25"])
-      s.add_dependency(%q<fog-rackspace>, ["~> 1.0"])
+      s.add_dependency(%q<fog>, ["~> 1.23"])
       s.add_dependency(%q<unf>, ["~> 0.1"])
       s.add_dependency(%q<facter>, ["~> 2.3"])
       s.add_dependency(%q<hiera>, ["~> 1.3"])
@@ -202,8 +200,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<nucleon>, [">= 0.2.2", "~> 0.2"])
-    s.add_dependency(%q<fog>, ["~> 1.25"])
-    s.add_dependency(%q<fog-rackspace>, ["~> 1.0"])
+    s.add_dependency(%q<fog>, ["~> 1.23"])
     s.add_dependency(%q<unf>, ["~> 0.1"])
     s.add_dependency(%q<facter>, ["~> 2.3"])
     s.add_dependency(%q<hiera>, ["~> 1.3"])

data/lib/CORL/machine/AWS.rb

@@ -1,49 +1,49 @@
 
 module CORL
 module Machine
-class AWS < Fog
- 
+class AWS < FogBase
+
   #-----------------------------------------------------------------------------
   # Checks
-   
+
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
-  
+
   def set_connection
     require 'unf'
     super
     Kernel.load File.join(File.dirname(__FILE__), '..', '..', 'core', 'mod', 'fog_aws_server.rb')
   end
- 
+
   #-----------------------------------------------------------------------------
   # Management
 
   def init_server
     super do
       myself.plugin_name = @server.id
-      
+
       node[:id]           = plugin_name
       node[:public_ip]    = @server.public_ip_address
-      node[:private_ip]   = @server.private_ip_address    
+      node[:private_ip]   = @server.private_ip_address
       node[:machine_type] = @server.flavor_id
-      node[:image]        = @server.image_id    
+      node[:image]        = @server.image_id
       node.user           = @server.username unless node.user
-      
+
       @server.private_key_path = node.private_key if node.private_key
       @server.public_key_path  = node.public_key if node.public_key
-    end  
+    end
   end
-  
+
   #---
- 
+
   def init_ssh(ssh_port)
     # Security group initialization
     if compute && ssh_port != 22
       ensure_security_group("CORL_SSH_#{ssh_port}", ssh_port)
     end
   end
-  
-  #--- 
+
+  #---
 
   def create(options = {})
     super do |config|
@@ -54,36 +54,36 @@ class AWS < Fog
       compute.key_pairs.create(
         :name       => keypair_name,
         :public_key => Util::Disk.read(node.public_key)
-      )      
+      )
       config[:key_name] = keypair_name
     end
   end
-  
+
   #---
-  
+
   def reload(options = {})
     super do |config|
       success = server.reboot
-      
+
       server.wait_for { ready? } if success
       success
     end
   end
-  
+
   #---
- 
+
   def create_image(options = {})
     super do |image_name, config, success|
       image_name        = image_name.gsub(/[^A-Za-z0-9\(\)\.\-\_\/]+/, '_')
       image_description = config.get(:description, "CORL backup image")
-      
+
       data     = compute.create_image(server.identity, image_name, image_description)
       image_id = data.body['imageId']
-      
-      ::Fog.wait_for do
+
+      Fog.wait_for do
         compute.describe_images('ImageId' => image_id).body['imagesSet'].first['imageState'] == 'available'
       end
-      
+
       if image_id
         node[:image] = image_id
         success      = true
@@ -91,7 +91,7 @@ class AWS < Fog
       success
     end
   end
-  
+
   #---
 
   def destroy(options = {})
@@ -102,36 +102,36 @@ class AWS < Fog
           key_pair.destroy
         end
       end
-      true  
+      true
     end
   end
-  
+
   #-----------------------------------------------------------------------------
   # Utilities
-  
+
   def keypair_name
-    "CORL_#{node.plugin_name}"  
+    "CORL_#{node.plugin_name}"
   end
-  
+
   #---
-  
+
   def ensure_security_group(group_name, from_port, to_port = nil, options = {})
     config         = Config.ensure(options)
     security_group = compute.security_groups.get(group_name)
     cidrip         = config.get(:cidrip, '0.0.0.0/0')
     protocol       = config.get(:protocol, 'tcp')
     to_port        = from_port if to_port.nil?
-    
+
     if security_group.nil?
       security_group = compute.security_groups.create(
         :name        => group_name,
-        :description => config.get(:description, "Opening port range: #{from_port} to #{to_port}")  
-      )          
-      raise unless security_group # TODO: Better error class       
+        :description => config.get(:description, "Opening port range: #{from_port} to #{to_port}")
+      )
+      raise unless security_group # TODO: Better error class
     end
-        
+
     authorized = false
-    if security_group.ip_permissions  
+    if security_group.ip_permissions
       authorized = security_group.ip_permissions.detect do |ip_permission|
         ip_permission['ipRanges'].first && ip_permission['ipRanges'].first['cidrIp'] == cidrip &&
         ip_permission['fromPort'] == from_port &&
@@ -142,7 +142,7 @@ class AWS < Fog
     unless authorized
       security_group.authorize_port_range(Range.new(from_port, to_port))
     end
-      
+
     if server
       server.groups = [ group_name ] | server.groups
       server.save

data/lib/CORL/machine/rackspace.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Machine
-class Rackspace < Fog
+class Rackspace < FogBase
 
   #-----------------------------------------------------------------------------
   # Checks
@@ -10,9 +10,8 @@ class Rackspace < Fog
   # Property accessors / modifiers
 
   def set_connection
-    require 'fog-rackspace'
     super
-    #Kernel.load File.join(File.dirname(__FILE__), '..', '..', 'core', 'mod', 'fog_rackspace_server.rb')
+    Kernel.load File.join(File.dirname(__FILE__), '..', '..', 'core', 'mod', 'fog_rackspace_server.rb')
   end
 
   #-----------------------------------------------------------------------------

data/lib/CORL/node/AWS.rb

@@ -1,63 +1,63 @@
 
 module CORL
 module Node
-class AWS < Fog
- 
+class AWS < FogBase
+
   #-----------------------------------------------------------------------------
   # Node plugin interface
-  
+
   def normalize(reload)
     super do
       region_info.import({
-        'us-east-1'      => 'US East       -- North Virginia', 
-        'us-west-1'      => 'US West       -- North California', 
+        'us-east-1'      => 'US East       -- North Virginia',
+        'us-west-1'      => 'US West       -- North California',
         'us-west-2'      => 'US West       -- Oregon',
         'eu-west-1'      => 'EU            -- Ireland',
-        'ap-northeast-1' => 'Asia Pacific  -- Tokyo', 
-        'ap-southeast-1' => 'Asia Pacific  -- Singapore', 
-        'ap-southeast-2' => 'Asia Pacific  -- Sydney',       
+        'ap-northeast-1' => 'Asia Pacific  -- Tokyo',
+        'ap-southeast-1' => 'Asia Pacific  -- Singapore',
+        'ap-southeast-2' => 'Asia Pacific  -- Sydney',
         'sa-east-1'      => 'South America -- Sao Paulo'
       })
-      
-      # Return machine provider      
+
+      # Return machine provider
       :aws
     end
   end
-       
+
   #-----------------------------------------------------------------------------
   # Checks
-  
+
   def usable_image?(image)
     image.state == 'available' && image.name
   end
-  
+
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
-    
+
   #-----------------------------------------------------------------------------
   # Settings groups
-    
+
   def machine_config
     super do |config|
-      config.import({ 
+      config.import({
         :provider => 'AWS',
         :region   => region.to_s
       })
-    
+
       config[:aws_access_key_id]     = api_user if api_user
       config[:aws_secret_access_key] = api_key if api_key
     end
   end
-  
+
   #---
-  
+
   def create_config
-    { :flavor_id => machine_type, :image_id => image, :username => user }  
+    { :flavor_id => machine_type, :image_id => image, :username => user }
   end
-  
+
   #-----------------------------------------------------------------------------
   # Node operations
-  
+
   def create(options = {})
     super do |op, config|
       if op == :config
@@ -65,9 +65,9 @@ class AWS < Fog
       end
     end
   end
- 
+
   #---
-  
+
   def start(options = {})
     super do |op, config|
       if op == :config
@@ -75,33 +75,33 @@ class AWS < Fog
       end
     end
   end
-  
+
   #-----------------------------------------------------------------------------
   # Utilities
-  
+
   def render_machine_type(machine_type)
-    sprintf("%-25s   %-50s  [ VCPUS: %-5s ] ( RAM: %6sMB | DISK: %8sGB )  ( BITS: %5s )", 
+    sprintf("%-25s   %-50s  [ VCPUS: %-5s ] ( RAM: %6sMB | DISK: %8sGB )  ( BITS: %5s )",
       purple(machine_type_id(machine_type)),
-      yellow(machine_type.name), 
-      blue(machine_type.cores.to_s),       
-      blue(machine_type.ram.to_s), 
-      blue(machine_type.disk.to_s), 
+      yellow(machine_type.name),
+      blue(machine_type.cores.to_s),
+      blue(machine_type.ram.to_s),
+      blue(machine_type.disk.to_s),
       blue(machine_type.bits.to_s)
     )
   end
-  
+
   #---
-  
+
   def render_image(image)
     description = image.name
     description = image.description if image.description && ! image.description.empty?
-    
+
     location = image.location.split('/').first
     sprintf("%-23s [ %-10s | %-6s ]   %s ( %s )", purple(image_id(image)), blue(image.state), image.architecture, yellow(description), cyan(location))
   end
-  
+
   #---
-  
+
   def image_search_text(image)
     location = image.location.split('/').first
     location = location.match(/^\d+$/) ? '' : location