classify_cluster 0.1.3 → 0.2.0

data/examples/cluster.rb

@@ -74,15 +74,14 @@ cluster :"appliance-cluster" do |cluster|
   
   cluster.node 'node1.fqdn', '10.11.11.321' do |node|
     
-    node.role :db, :primary => true
+    node.role :db, :primary => true do |role|
+      role.variable 'serverid', 1
+    end
     node.role :queue
     node.role :cron, :primary => true, :backup => true
     node.role :app
     node.role :worker
     node.role :munin, :node => true
-    
-    node.variable 'serverid', 1
-    
   end
   
   cluster.node 'node2.fqdn', '10.11.11.123' do |node|

data/lib/classify_cluster/configurator/cluster.rb

@@ -1,14 +1,6 @@
 module ClassifyCluster
   module Configurator
     class Cluster
-      ROLE_2_VARIABLE_MAP = {
-        'app' => ['app_servers', []],
-        'db' => ['database_host', ''],
-        'queue' => ['queue_host', ''],
-        'push' => ['blow_server', ''],
-        'search' => ['solr_host', ''],
-        'munin' => ['munin_master', '']
-      }
       attr_reader :nodes, :name, :classes, :variables, :resources, :hostnames
       def initialize(*args, &block)
         @nodes = {}
@@ -21,22 +13,6 @@ module ClassifyCluster
         @nodes.each_pair do |fqdn, node|
           @variables['hostnames'] = [] unless @variables['hostnames']
           @variables['hostnames'] << "#{fqdn}/#{node.private_ip}"
-          node.roles.each do |role|
-            next unless ROLE_2_VARIABLE_MAP.has_key?(role.type.to_s)
-            if role.type.to_s == 'munin' && role.options.has_key?('master')
-              @variables['munin_master'] = node.private_ip
-              next
-            end
-            variable_name = ROLE_2_VARIABLE_MAP[role.type.to_s].first
-            variable_initial_value = ROLE_2_VARIABLE_MAP[role.type.to_s][1]
-            @variables[variable_name] = variable_initial_value unless @variables.has_key?(variable_name)
-            
-            if @variables[variable_name].is_a?(Array)
-              @variables[variable_name] << node.private_ip
-            else
-              @variables[variable_name] = node.private_ip
-            end
-          end
         end
         @nodes.each_pair do |fqdn, node|
           node.resource do |resource|
@@ -57,7 +33,7 @@ module ClassifyCluster
       end
       def node(node_name, private_ip, &block)
         @hostnames[node_name] = private_ip
-        @nodes[node_name] = ClassifyCluster::Configurator::Node.new(node_name, private_ip, &block)
+        @nodes[node_name] = ClassifyCluster::Configurator::Node.new(node_name, private_ip, self, &block)
       end
       def variable(name, value)
         @variables[name] = value

data/lib/classify_cluster/configurator/node.rb

@@ -1,20 +1,9 @@
 module ClassifyCluster
   module Configurator
     class Node
-      ROLE_2_KLASS_MAP = {
-        'db' => { 'primary' => 'databaseserver::onpremise', 'backup' => 'databasereplicationserver::onpremise'},
-        'queue' => 'queueserver::onpremise',
-        'app' => 'appserver::onpremise',
-        'worker' => 'workerserver::onpremise',
-        'web' => 'webserver::onpremise',
-        'puppet_master' => 'puppetmaster::onpremise',
-        'munin' => { 'master' => 'munin::master::onpremise', 'node' => 'munin::node::onpremise' },
-        'push' => 'pushserver::onpremise',
-        'cache' => 'memcached',
-        'search' => 'searchserver::onpremise'
-      }
-      attr_reader :fqdn, :variables, :resources, :classes, :private_ip, :public_ip, :roles, :default
+      attr_reader :cluster, :fqdn, :variables, :resources, :classes, :private_ip, :public_ip, :roles, :default
       def initialize(*args, &block)
+        @cluster = args[2]
         @variables = {}
         @resources = []
         @classes = []
@@ -22,18 +11,7 @@ module ClassifyCluster
         @fqdn = (args.first.to_s == 'default' ? '' : args.first)
         @private_ip = (args[1].to_s == 'default' ? '' : args[1])
         @default = args.first.to_s == 'default'
-        returned = block.call(self)
-        @roles.each do |role|
-          if ROLE_2_KLASS_MAP.has_key?(role.type.to_s)
-            if role.options.size > 0
-              role.options.each_pair do |key, value|
-                @classes << ROLE_2_KLASS_MAP[role.type.to_s][key.to_s]
-              end
-            else
-              @classes << ROLE_2_KLASS_MAP[role.type.to_s]
-            end
-          end
-        end
+        block.call(self)
       end
       def default?
         return @default
@@ -50,8 +28,8 @@ module ClassifyCluster
         return (@public_ip || @private_ip) unless value
         @public_ip = value
       end
-      def role(type, options={})
-        @roles << ClassifyCluster::Configurator::Role.new(type, options)
+      def role(type='', options={}, &block)
+        @roles << ClassifyCluster::Configurator::Role.new(self, type, options, &block)
       end
       def variable(name, value)
         @variables[name] = value

data/lib/classify_cluster/configurator/role.rb

@@ -1,10 +1,14 @@
 module ClassifyCluster
   module Configurator
     class Role
-      attr_reader :type, :options
-      def initialize(type, options={})
+      attr_reader :type, :options, :node, :variables
+      def initialize(node, type, options={}, &block)
         @type = type
-        @options = options
+        @options = options.symbolize_keys
+        @node = node
+        @variables = {}
+        block.call(self) if block_given?
+        self.send("after_#{@type}_role_assignment".to_sym)
       end
       def type(value = nil)
         return @type unless value
@@ -14,6 +18,58 @@ module ClassifyCluster
         return @options unless value
         @options = value
       end
+      def variable(name, value)
+        @variables[name] = value
+        @node.variable name, value
+      end
+      private
+      def add_klass_from_role
+        case @type.to_s
+        when "db"
+          @node.klass "databaseserver::onpremise" if @options.has_key?(:primary)
+          @node.klass "databasereplicationserver::onpremise" if @options.has_key?(:backup)
+        when "puppet_master"
+          @node.klass "puppet_master::onpremise"
+        when "munin"
+          @node.klass "munin::master::onpremise" if @options.has_key?(:master)
+          @node.klass "munin::node::onpremise" if @options.has_key?(:node)
+        when "cache"
+          @node.klass "memcached"
+        when "queue"
+          @node.klass "#{@type.to_s}server::onpremise"
+        when "app"
+          @node.klass "#{@type.to_s}server::onpremise"
+        when "worker"
+          @node.klass "#{@type.to_s}server::onpremise"
+        when "web"
+          @node.klass "#{@type.to_s}server::onpremise"
+        when "push"
+          @node.klass "#{@type.to_s}server::onpremise"
+        when "search"
+          @node.klass "#{@type.to_s}server::onpremise"
+        end
+      end
+      def add_variable_from_role
+        case @type.to_s
+        when 'app'
+          @node.cluster.variables['app_servers'] ||= []
+          @node.cluster.variables['app_servers'] << @node.private_ip
+        when 'db'
+          @node.cluster.variable('database_host', @node.private_ip) if @options.has_key?(:primary)
+        when 'queue'
+          @node.cluster.variable 'queue_host', @node.private_ip
+        when 'push'
+          @node.cluster.variable 'blow_server', @node.private_ip
+        when 'search'
+          @node.cluster.variable 'solr_host', @node.private_ip
+        when 'munin'
+          @node.cluster.variable('munin_master', @node.private_ip) if @options.has_key?(:master)
+        end
+      end
+      def method_missing(method_name, *args)
+        add_klass_from_role
+        add_variable_from_role
+      end
     end
   end
 end

data/lib/classify_cluster/version.rb

@@ -1,3 +1,3 @@
 module ClassifyCluster
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: classify_cluster
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sean Cashin
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-09 00:00:00 -08:00
+date: 2010-11-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency