corl 0.4.10 → 0.4.11

data/VERSION

@@ -1 +1 @@
-0.4.10
+0.4.11

data/bootstrap/os/ubuntu/00_base.sh

@@ -7,8 +7,11 @@ echo "$HOSTNAME" > "/etc/hostname" || exit 1
 sed -ri 's/127\.0\.1\.1.*//' /etc/hosts
 echo "127.0.1.1 $HOSTNAME" >> /etc/hosts || exit 2
 
+# Set OpenDNS as our DNS lookup source
+echo "nameserver 208.67.222.222" | tee /etc/resolvconf/resolv.conf.d/base > /dev/null || exit 3
+
 # Update system packages
-apt-get update || exit 3
+apt-get update || exit 4
 
 # Install basic build packages.
-apt-get -y install build-essential || exit 4
+apt-get -y install build-essential curl || exit 5

data/corl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "corl"
-  s.version = "0.4.10"
+  s.version = "0.4.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adrian Webb"]
-  s.date = "2014-03-22"
+  s.date = "2014-03-23"
   s.description = "Framework that provides a simple foundation for growing organically in the cloud"
   s.email = "adrian.webb@coralnexus.com"
   s.executables = ["corl"]
@@ -77,6 +77,7 @@ Gem::Specification.new do |s|
     "lib/core/mixin/lookup.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/action.rb",
     "lib/core/plugin/configuration.rb",

data/lib/CORL/configuration/file.rb

@@ -145,7 +145,15 @@ class File < CORL.plugin_class(:configuration)
     if config.get(:nodes, false)
       config[:nodes].each do |provider, data|
         data.each do |name, info|
-          file_data.set([ ::File.join('nodes', provider.to_s, "#{name}.#{default_provider}"), :nodes, provider, name ], info)  
+          config_name = ::File.join('nodes', provider.to_s, "#{name}.#{default_provider}")
+          file_data.set([ config_name, :nodes, provider, name ], info)
+          
+          unless search[config_name]
+            search[config_name] = {
+              :provider => default_provider,
+              :file     => ::File.join(project.directory, config_name)
+            }
+          end
         end
       end
     end    

data/lib/CORL/machine/rackspace.rb

@@ -8,6 +8,11 @@ class Rackspace < Fog
    
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
+  
+  def set_connection
+    super
+    Kernel.load File.join(File.dirname(__FILE__), '..', '..', 'core', 'mod', 'fog_rackspace_server.rb')
+  end
  
   #-----------------------------------------------------------------------------
   # Management

data/lib/core/mixin/macro/network_settings.rb

@@ -44,7 +44,13 @@ module NetworkSettings
   
     define_method :[]= do |name, value|
       set_setting(name, value)
-    end   
+    end
+    
+    #---
+  
+    define_method :groups do
+      array(myself[:settings])
+    end     
   end
 end
 end

data/lib/core/mod/fog_rackspace_server.rb

@@ -0,0 +1,28 @@
+module Fog
+module Compute
+class RackspaceV2
+class Server
+  
+  def setup(credentials = {})
+    requires :ssh_ip_address, :identity, :public_key, :username
+
+    commands = [
+      %{mkdir .ssh},
+      %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
+      password_lock,
+      %{echo "#{Fog::JSON.encode(attributes)}" >> ~/attributes.json},
+      %{echo "#{Fog::JSON.encode(metadata)}" >> ~/metadata.json}
+    ]
+    commands.compact
+
+    @password = nil if password_lock
+    
+    Fog::SSH.new(ssh_ip_address, username, credentials).run(commands)
+  rescue Errno::ECONNREFUSED, Net::SSH::Disconnect
+    sleep(1)
+    retry
+  end  
+end
+end
+end
+end

data/lib/core/plugin/node.rb

@@ -76,51 +76,9 @@ class Node < CORL.plugin_class(:base)
   #-----------------------------------------------------------------------------
   # Property accessors / modifiers
   
-  def network
-    return plugin_parent
-  end
- 
-  def network=network
-    myself.plugin_parent = network
-  end
-  
-  #---
-  
-  def setting(property, default = nil, format = false)
-    return network.node_setting(plugin_provider, plugin_name, property, default, format)
-  end
-  
-  def search(property, default = nil, format = false)
-    return network.search_node(plugin_provider, plugin_name, property, default, format)
-  end
-  
-  def set_setting(property, value = nil)
-    network.set_node_setting(plugin_provider, plugin_name, property, value)
-  end
-  
-  def delete_setting(property)
-    network.delete_node_setting(plugin_provider, plugin_name, property)
-  end
+  network_settings :node
   
   #---
- 
-  def [](name, default = nil, format = false)
-    search(name, default, format)
-  end
-  
-  #---
-  
-  def []=(name, value)
-    set_setting(name, value)
-  end
-   
-  #-----------------------------------------------------------------------------
-  
-  def groups
-    array(myself[:settings])
-  end
-  
-  #-----------------------------------------------------------------------------
   
   def machine
     @machine

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: corl
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-22 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nucleon
-  requirement: &13666440 !ruby/object:Gem::Requirement
+  requirement: &16320620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *13666440
+  version_requirements: *16320620
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &13707100 !ruby/object:Gem::Requirement
+  requirement: &16319740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '1.20'
   type: :runtime
   prerelease: false
-  version_requirements: *13707100
+  version_requirements: *16319740
 - !ruby/object:Gem::Dependency
   name: unf
-  requirement: &13704400 !ruby/object:Gem::Requirement
+  requirement: &16319040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *13704400
+  version_requirements: *16319040
 - !ruby/object:Gem::Dependency
   name: facter
-  requirement: &13703160 !ruby/object:Gem::Requirement
+  requirement: &16877680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.7'
   type: :runtime
   prerelease: false
-  version_requirements: *13703160
+  version_requirements: *16877680
 - !ruby/object:Gem::Dependency
   name: hiera
-  requirement: &13702140 !ruby/object:Gem::Requirement
+  requirement: &16877000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *13702140
+  version_requirements: *16877000
 - !ruby/object:Gem::Dependency
   name: puppet
-  requirement: &13710280 !ruby/object:Gem::Requirement
+  requirement: &16876060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *13710280
+  version_requirements: *16876060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &13737660 !ruby/object:Gem::Requirement
+  requirement: &16874680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *13737660
+  version_requirements: *16874680
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &13793700 !ruby/object:Gem::Requirement
+  requirement: &16873360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *13793700
+  version_requirements: *16873360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &13820340 !ruby/object:Gem::Requirement
+  requirement: &16871920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '2.10'
   type: :development
   prerelease: false
-  version_requirements: *13820340
+  version_requirements: *16871920
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &13818660 !ruby/object:Gem::Requirement
+  requirement: &16514780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *13818660
+  version_requirements: *16514780
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &13815660 !ruby/object:Gem::Requirement
+  requirement: &16514040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *13815660
+  version_requirements: *16514040
 description: Framework that provides a simple foundation for growing organically in
   the cloud
 email: adrian.webb@coralnexus.com
@@ -201,6 +201,7 @@ files:
 - lib/core/mixin/lookup.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/action.rb
 - lib/core/plugin/configuration.rb