classify_cluster 0.2.3 → 0.2.4

data/lib/classify_cluster/configurator/cluster.rb

@@ -1,8 +1,9 @@
 module ClassifyCluster
   module Configurator
     class Cluster
-      attr_reader :nodes, :name, :classes, :variables, :resources, :hostnames
+      attr_reader :nodes, :name, :classes, :variables, :resources, :hostnames, :ssl_pem
       def initialize(*args, &block)
+        @ssl_pem = {}
         @nodes = {}
         @variables = {}
         @resources = []
@@ -27,6 +28,10 @@ module ClassifyCluster
         end
         returned
       end
+      def ssl_pem(file_path=nil, module_name=nil)
+        return @ssl_pem if file_path.nil? && module_name.nil?
+        @ssl_pem = {:file_path => file_path, :module => module_name}
+      end
       def name(value=nil)
         return @name unless value
         @name = value

data/lib/classify_cluster/configurator/role.rb

@@ -33,8 +33,6 @@ module ClassifyCluster
         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"
@@ -49,19 +47,21 @@ module ClassifyCluster
           @node.klass "#{@type.to_s}server::onpremise"
         when "file"
           @node.klass "#{@type.to_s}server::onpremise"
+        when "cache"
+          @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
+          @node.cluster.variables['app_hosts'] ||= []
+          @node.cluster.variables['app_hosts'] << @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
+          @node.cluster.variable 'blow_host', @node.private_ip
         when 'search'
           @node.cluster.variable 'solr_host', @node.private_ip
         when 'munin'
@@ -69,6 +69,8 @@ module ClassifyCluster
         when 'file'
           @node.cluster.variables['fileserver_hosts'] ||= []
           @node.cluster.variables['fileserver_hosts'] << @node.private_ip
+        when 'cache'
+          @node.cluster.variables 'cache_host', @node.private_ip
         end
       end
       def method_missing(method_name, *args)

data/lib/classify_cluster/version.rb

@@ -1,3 +1,3 @@
 module ClassifyCluster
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/lib/classify_cluster/writers/puppet.rb

@@ -1,3 +1,4 @@
+require 'fileutils'
 module ClassifyCluster
   module Writers
     class Puppet
@@ -6,6 +7,12 @@ module ClassifyCluster
         config = ClassifyCluster::Configurator::Configuration.new(options[:config_file])
         config.clusters.each_pair do |name, cluster|
           next if options[:cluster] && !(options[:cluster] == cluster.name.to_s)
+          unless cluster.ssl_pem.empty?
+            pem_file = "/etc/puppet/modules/#{cluster.ssl_pem[:module]}/files/#{cluster.name.to_s}.#{File.basename(cluster.ssl_pem[:file_path])}"
+            FileUtils.cp cluster.ssl_pem[:file_path], pem_file
+            FileUtils.chown 'root', 'puppet', pem_file
+            FileUtils.chmod 0640, pem_file
+          end
           File.open(File.join(export_to_folder, "#{cluster.name}.pp"), 'w') do |file|
             cluster.nodes.each_pair do |fqdn, node|
               file.write(output(%Q%node "#{node.default? ? 'default' : node.fqdn}" {%))

metadata

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