rig 0.3.2 → 0.3.3

data/conf/config.yml

@@ -6,11 +6,11 @@ rig:
   #
   #chef:
   #   knife: /path/to/chef/knife.rb
-  #
-  # TODO: Figure out the same thing for puppet
+
+  #TODO: Figure out the same thing for puppet
 
   ssh:
-    # user to connect as, when ssh to server
+    # user to connect as, when ssh'ing to server
     user: root
 
   # the account to use if one is not specified

data/lib/rig/cloud/environment.rb

@@ -5,7 +5,7 @@ module Rig
       attr_reader :balancers
       attr_reader :name
       attr_reader :template
-      attr_reader :ami
+      attr_reader :image
       attr_reader :region
       attr_reader :flavor
 
@@ -24,7 +24,7 @@ module Rig
           :multi => {
               :groups    => %w{app-server db-inqcloud-dev},
               :instances => [
-                  :harvester => { :flavor => 'c1.large', :count => 3, :ami => "ami-faketest" },
+                  :harvester => { :flavor => 'c1.large', :count => 3, :image => "ami-faketest" },
                   :queue     => { :flavor => 'c1.medium', :count => 3 },
                   :cache     => { :flavor => 'm1.medium', :count => 3 },
                   :app       => { :flavor => 'c1.large', :count => 3, :balance => true, :primary => true }
@@ -64,6 +64,7 @@ module Rig
         end
       end
 
+      #TODO: overall, need better handling for global config, template and local overrides
       def initialize(name, template=nil, opts={ })
         @options = {
             :region => Rig.config.region,
@@ -72,7 +73,9 @@ module Rig
         @name      = name
         @template  = template
         @region    = @options[:region]
-        @ami       = @options[:ami] || Rig.config.ami[@region] || Rig.config.ami
+        #TODO: allow global config setting for image (in AWS, the ami)
+        @image     = @options[:image] # || Rig.config.compute.image[@region] || Rig.config.compute.image
+        #TODO: allow global config setting for flavor (in AWS, the size, like: m1.large)
         @flavor    = @options[:flavor] # || Rig.config.flavor[@region] || Rig.config.flavor
         @servers   = []
         @balancers = []
@@ -89,7 +92,7 @@ module Rig
           setinstances = []
           inst.each do |role, tmpl|
             count   = tmpl[:count]
-            ami     = tmpl[:ami] || @ami
+            image   = tmpl[:image] || @image
             flavor  = tmpl[:flavor] || @flavor
             keypair = Rig.config.keypair
             count.times do |i|
@@ -97,7 +100,7 @@ module Rig
               chef = Rig.config.chef ? true : false
 
               o = {
-                  :image_id  => ami,
+                  :image_id  => image,
                   :flavor_id => flavor,
                   :key_name  => keypair,
                   :groups    => tmpl[:groups] || template[:groups],

data/lib/rig/config.rb

@@ -33,6 +33,10 @@ module Rig
       end
     end
 
+    def template(name)
+      #TODO: implement getting template data from file
+    end
+
     def get_account
       return ENV['RIG_ACCOUNT'] if ENV['RIG_ACCOUNT']
       return Rig.config.default_account if Rig.config.default_account

data/lib/rig/version.rb

@@ -3,7 +3,7 @@ unless defined?(Rig::Version)
     module Version
       MAJOR = 0
       MINOR = 3
-      TINY  = 2
+      TINY  = 3
       STRING = [MAJOR, MINOR, TINY].join('.')
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rig
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Shawn Catanzarite