classify_cluster 0.1.1 → 0.1.2

data/lib/classify_cluster/configurator/cluster.rb

@@ -3,10 +3,11 @@ module ClassifyCluster
     class Cluster
       ROLE_2_VARIABLE_MAP = {
         'app' => ['app_servers', []],
-        'db' => ['database_server', ''],
-        'queue' => ['queue_server', ''],
+        'db' => ['database_host', ''],
+        'queue' => ['queue_host', ''],
         'push' => ['blow_server', ''],
-        'search' => ['solr_host', '']
+        'search' => ['solr_host', ''],
+        'munin' => ['munin_master', '']
       }
       attr_reader :nodes, :name, :classes, :variables, :resources, :hostnames
       def initialize(*args, &block)
@@ -22,7 +23,10 @@ module ClassifyCluster
           @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)

data/lib/classify_cluster/version.rb

@@ -1,3 +1,3 @@
 module ClassifyCluster
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/classify_cluster/writers/capistrano.rb

@@ -1,6 +1,18 @@
 module ClassifyCluster
   module Writers
     class Capistrano
+      CLUSTER_ROLE_2_CAP_ROLE = {
+        'db' => 'db',
+        'queue' => 'rabbitmq',
+        'cron' => 'cron',
+        'app' => 'app',
+        'worker' => 'workling',
+        'munin' => 'munin',
+        'web' => 'web',
+        'push' => 'push',
+        'puppet_master' => 'puppet_master',
+        'search' => 'solr'
+      }
       def self.export!(capistrano_configurator, cluster, config_file=ClassifyCluster::Base.default_config_file)
         config = ClassifyCluster::Configurator::Configuration.new(config_file).clusters[cluster]
         config.variables.each_pair do |name, value|
@@ -10,11 +22,7 @@ module ClassifyCluster
           roles = node.roles
           next if roles.empty?
           roles.each do |role|
-            if role.type == 'queue'
-              capistrano_configurator.role('rabbitmq', node.public_ip, role.options)
-            else
-              capistrano_configurator.role(role.type, node.public_ip, role.options)
-            end
+            capistrano_configurator.role((CLUSTER_ROLE_2_CAP_ROLE[role.type.to_s] || role.type.to_s), node.fqdn, role.options)
           end
         end
       end

metadata

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