ironfan 3.2.2 → 4.0.0

data/lib/ironfan.rb

@@ -1,32 +1,7 @@
-require 'chef/mash'
-require 'chef/config'
-#
-require 'gorillib/metaprogramming/class_attribute'
-require 'gorillib/hash/reverse_merge'
-require 'gorillib/object/blank'
-require 'gorillib/hash/compact'
-require 'gorillib/builder'
-require 'set'
-
-require 'ironfan/dsl_builder'
-require 'ironfan/security_group'
-require 'ironfan/cloud'
-require 'ironfan/compute'           # base class for machine attributes
-require 'ironfan/facet'             # similar machines within a cluster
-require 'ironfan/cluster'           # group of machines with a common mission
-require 'ironfan/server'            # realization of a specific facet
-require 'ironfan/discovery'         # pair servers with Fog and Chef objects
-require 'ironfan/server_slice'      # collection of server objects
-require 'ironfan/volume'            # configure external and internal volumes
-require 'ironfan/private_key'       # coordinate chef keys, cloud keypairs, etc
-require 'ironfan/role_implications' # make roles trigger other actions (security groups, etc)
-#
-require 'ironfan/chef_layer'        # interface to chef for server actions
-require 'ironfan/fog_layer'         # interface to fog  for server actions
-#
-require 'ironfan/deprecated'        # stuff slated to go away
+require 'ironfan/requirements'
 
 module Ironfan
+  @@clusters ||= Hash.new
 
   # path to search for cluster definition files
   def self.cluster_path
@@ -40,7 +15,7 @@ module Ironfan
   #
   # Delegates
   def self.clusters
-    Chef::Config[:clusters] ||= Mash.new
+    Chef::Config[:clusters] ||= Hash.new
   end
 
   def self.ui=(ui) @ui = ui ; end
@@ -49,6 +24,11 @@ module Ironfan
   def self.chef_config=(cc) @chef_config = cc ; end
   def self.chef_config()    @chef_config      ; end
 
+# simple delegation to multiple targets
+  def self.delegate_to(targets,options={},&block)
+    raise 'missing block' unless block_given?
+    [targets].flatten.each {|target| target.instance_eval &block }
+  end
   #
   # Defines a cluster with the given name.
   #
@@ -71,9 +51,9 @@ module Ironfan
   #
   def self.cluster(name, attrs={}, &block)
     name = name.to_sym
-    cl = ( self.clusters[name] ||= Ironfan::Cluster.new(name) )
+
+    cl = ( @@clusters[name] ||= Ironfan::Dsl::Cluster.new({:name => name}) )
     cl.receive!(attrs, &block)
-    cl
   end
 
   #
@@ -85,17 +65,21 @@ module Ironfan
   #
   # @return [Ironfan::Cluster] the requested cluster
   def self.load_cluster(cluster_name)
+    cluster = cluster_name.to_sym
     raise ArgumentError, "Please supply a cluster name" if cluster_name.to_s.empty?
-    return clusters[cluster_name] if clusters[cluster_name]
+    return @@clusters[cluster] if @@clusters[cluster]
 
     cluster_file = cluster_filenames[cluster_name] or die("Couldn't find a definition for #{cluster_name} in cluster_path: #{cluster_path.inspect}")
 
     Chef::Log.info("Loading cluster #{cluster_file}")
 
     require cluster_file
-    unless clusters[cluster_name] then  die("#{cluster_file} was supposed to have the definition for the #{cluster_name} cluster, but didn't") end
+    unless @@clusters[cluster] then  die("#{cluster_file} was supposed to have the definition for the #{cluster_name} cluster, but didn't") end
 
-    clusters[cluster_name]
+    # Flesh out the expected servers listed in the facets
+    @@clusters[cluster].expand_servers!
+
+    @@clusters[cluster]
   end
 
   #
@@ -141,4 +125,31 @@ module Ironfan
       Chef::Log.error( boom.backtrace.join("\n") )
     end
   end
+
+  #
+  # Utility to show a step of the overall process
+  #
+  def self.step(name, desc, *style)
+    ui.info("  #{"%-15s" % (name.to_s+":")}\t#{ui.color(desc.to_s, *style)}")
+  end
+
+  #
+  # Utility to do mock out a step during a dry-run
+  #
+  def self.unless_dry_run
+    if dry_run?
+      ui.info("      ... but not really")
+      return nil
+    else
+      yield
+    end
+  end
+  def self.dry_run?
+    chef_config[:dry_run]
+  end
+
+  # Intentionally skipping an implied step 
+  def self.noop(source,method,*params)
+    Chef::Log.debug("Nothing to do for #{source}.#{method}(#{params.join(',')}), skipping")
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.2.2
+  version: 4.0.0
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-10 00:00:00 Z
+date: 2012-09-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -175,28 +175,41 @@ files:
 - lib/chef/knife/cluster_start.rb
 - lib/chef/knife/cluster_stop.rb
 - lib/chef/knife/cluster_sync.rb
-- lib/chef/knife/cluster_vagrant.rb
 - lib/chef/knife/ironfan_knife_common.rb
 - lib/chef/knife/ironfan_script.rb
-- lib/chef/knife/vagrant/ironfan_environment.rb
-- lib/chef/knife/vagrant/ironfan_provisioners.rb
-- lib/chef/knife/vagrant/skeleton_vagrantfile.rb
+- lib/gorillib/resolution.rb
 - lib/ironfan.rb
-- lib/ironfan/chef_layer.rb
-- lib/ironfan/cloud.rb
-- lib/ironfan/cluster.rb
-- lib/ironfan/compute.rb
+- lib/ironfan/broker.rb
+- lib/ironfan/broker/computer.rb
+- lib/ironfan/broker/drive.rb
+- lib/ironfan/builder.rb
 - lib/ironfan/deprecated.rb
-- lib/ironfan/discovery.rb
-- lib/ironfan/dsl_builder.rb
-- lib/ironfan/facet.rb
-- lib/ironfan/fog_layer.rb
-- lib/ironfan/private_key.rb
-- lib/ironfan/role_implications.rb
-- lib/ironfan/security_group.rb
-- lib/ironfan/server.rb
-- lib/ironfan/server_slice.rb
-- lib/ironfan/volume.rb
+- lib/ironfan/dsl.rb
+- lib/ironfan/dsl/cloud.rb
+- lib/ironfan/dsl/cluster.rb
+- lib/ironfan/dsl/compute.rb
+- lib/ironfan/dsl/ec2.rb
+- lib/ironfan/dsl/facet.rb
+- lib/ironfan/dsl/role.rb
+- lib/ironfan/dsl/server.rb
+- lib/ironfan/dsl/virtualbox.rb
+- lib/ironfan/dsl/volume.rb
+- lib/ironfan/headers.rb
+- lib/ironfan/provider.rb
+- lib/ironfan/provider/chef.rb
+- lib/ironfan/provider/chef/client.rb
+- lib/ironfan/provider/chef/node.rb
+- lib/ironfan/provider/chef/role.rb
+- lib/ironfan/provider/ec2.rb
+- lib/ironfan/provider/ec2/ebs_volume.rb
+- lib/ironfan/provider/ec2/elastic_ip.rb
+- lib/ironfan/provider/ec2/key_pair.rb
+- lib/ironfan/provider/ec2/machine.rb
+- lib/ironfan/provider/ec2/placement_group.rb
+- lib/ironfan/provider/ec2/security_group.rb
+- lib/ironfan/provider/virtualbox.rb
+- lib/ironfan/provider/virtualbox/machine.rb
+- lib/ironfan/requirements.rb
 - spec/ironfan/cluster_spec.rb
 - spec/ironfan/facet_spec.rb
 - spec/ironfan/server_slice_spec.rb
@@ -219,7 +232,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1629322618717092090
+      hash: -4005934554339854543
       segments: 
       - 0
       version: "0"

data/lib/chef/knife/cluster_vagrant.rb

@@ -1,144 +0,0 @@
-#
-# Author:: Philip (flip) Kromer (<flip@infochimps.com>)
-# Copyright:: Copyright (c) 2011 Infochimps, Inc
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-class Chef
-  class Knife
-
-    #
-    # Vagrant support is VERY rough. It will
-    #
-    # * change the ui/commandline args, at the worst possible moment for you to adapt
-    # * show you info that is inaccurate, even beyond the obvious fact that it reports AWS properties.
-    # * translate your documents into swahili, make your TV record Gigli -- [tracker issue here](http://bit.ly/vrsalert)
-    #
-    # Vagrant has a really strong narcissistic streak, even more so than chef
-    # and ironfan already do.  I don't want to fight (it's probably that way for
-    # good reasons), so the following oddball procedure may persist until it a)
-    # stops working well or b) someone recommends a better approach.
-    #
-    # when you run `knife cluster vagrant command cluster-[facet-[indexes]]` we:
-    #
-    # * identify all servers defined on that cluster
-    # * find (or make) the directory config.vagrant_path
-    #   - if unset, will use `{homebase}/vagrants/{cluster_name}`
-    # * copy a special-purpose vagrantfile into that directory
-    #   - it is called vagrantfile, but won't work in a standalone way.
-    #
-    #
-    class ClusterVagrant < Knife
-      IRONFAN_DIR = File.dirname(File.realdirpath(__FILE__))
-      require File.expand_path('ironfan_knife_common', IRONFAN_DIR)
-      include Ironfan::KnifeCommon
-
-      deps do
-        Ironfan::KnifeCommon.load_deps
-        require 'vagrant'
-        require File.expand_path('vagrant/ironfan_environment',  IRONFAN_DIR)
-        require File.expand_path('vagrant/ironfan_provisioners', IRONFAN_DIR)
-      end
-
-      banner "knife cluster vagrant CMD CLUSTER[-FACET[-INDEXES]] (options) - runs the given command against a vagrant environment created from your cluster definition. EARLY, use at your own risk"
-
-      option :cloud,
-        :long        => "--cloud PROVIDER",
-        :short       => "-p",
-        :description => "cloud provider to target, or 'false' to skip cloud-targeted steps. (default false)",
-        :default     => false,
-        :boolean     => false
-
-      def run
-        # The subnet for this world
-        Chef::Config.host_network_base   ||= '33.33.33'
-        # Location that cookbooks, roles, etc will be mounted on vm
-        # set to false to skip
-        Chef::Config.homebase_on_vm_dir "/homebase" if Chef::Config.homebase_on_vm_dir.nil?
-        # yuck. necessary until cloud agnosticism shows up
-        Chef::Config[:cloud] = config[:cloud] = false
-        # TODO: make this customizable
-        Chef::Config[:vagrant_path] = File.expand_path("vagrants", Chef::Config.homebase)
-
-        # standard ironfan knife preamble
-        load_ironfan
-        die("Missing command or slice:\n#{banner}") if @name_args.length < 2
-        die("Too many args:\n#{banner}")            if @name_args.length > 2
-        configure_dry_run
-        ui.warn "Vagrant support is VERY rough: the ui will change, displays are inaccurate, may translate your documents into swahili"
-
-        #
-        # Load the servers. Note carefully: this is subtly different from all
-        # the other `knife cluster` commands. Vagrant provides idempotency, but
-        # we want the vagrant file to be invariant to the particular servers
-        # you're asking it to diddle.
-        #
-        # So we configure VMs for all servers in the cluster, but only issue the
-        # cli command against the ones given by the server slice.
-        #
-        vagrant_command, slice_string = @name_args
-        target      = get_slice(slice_string)
-        all_servers = target.cluster.servers
-        display(target)
-
-        # Pre-populate information in chef
-        section("Sync'ing to chef and cloud")
-        target.sync_to_chef
-
-        # FIXME: I read somewhere that global variables are a smell for something
-        $ironfan_target = all_servers
-
-        #
-        # Prepare vagrant
-        #
-        section("Configuring vagrant", :green)
-
-        cluster_vagrant_dir  = File.expand_path(target.cluster.name.to_s, Chef::Config.vagrant_path)
-        skeleton_vagrantfile = File.expand_path('vagrant/skeleton_vagrantfile.rb', IRONFAN_DIR)
-
-        # using ':vagrantfile_name => skeleton_vagrantfile' doesn't seem to work
-        # in vagrant - the VM comes out incompletely configured in a way I don't
-        # totally understand. Plus it wants its own directory anyhow. So, make a
-        # directory to hold vagrantfiles and push the skeleton in there
-        FileUtils.mkdir_p cluster_vagrant_dir
-        FileUtils.cp      skeleton_vagrantfile, File.join(cluster_vagrant_dir, 'vagrantfile')
-
-        log_level = [0, (3 - config[:verbosity])].max
-        env = Vagrant::IronfanEnvironment.new(
-          :ui_class    => Vagrant::UI::Colored,
-          :cwd         => cluster_vagrant_dir,
-          :log_level   => log_level,
-          )
-
-        #
-        # Run command
-        #
-        section("issuing command 'vagrant #{vagrant_command}'", :green)
-
-        target.servers.each do |server|
-          env.cli(vagrant_command, server.fullname)
-        end
-      end
-
-      def display(target)
-        super(target.cluster.servers,
-          ["Name", "InstanceID", "State", "Flavor", "Image", "AZ", "Public IP", "Private IP", "Created At", 'Volumes', 'Elastic IP']) do |svr|
-          { 'targeted?' => (target.include?(svr) ? "[blue]true[reset]" : '-' ), }
-        end
-      end
-
-    end
-  end
-end

data/lib/chef/knife/vagrant/ironfan_environment.rb

@@ -1,18 +0,0 @@
-module Vagrant
-  class IronfanEnvironment < Vagrant::Environment
-
-    def initialize(opts={})
-      super(opts)
-      munge_logger(opts)
-    end
-
-
-  protected
-    def munge_logger(opts)
-      logger = Log4r::Logger.new("vagrant")
-      logger.outputters = Log4r::Outputter.stderr
-      logger.level = opts[:log_level] || 3
-      logger.info( "ironfan vagrant (#{self}) - cwd: #{cwd}")
-    end
-  end
-end

data/lib/chef/knife/vagrant/ironfan_provisioners.rb

@@ -1,27 +0,0 @@
-module Vagrant
-  module Provisioners
-    class IronfanChefClient < Vagrant::Provisioners::ChefClient
-      class Config < Vagrant::Provisioners::ChefClient::Config
-        attr_accessor :upload_client_key
-      end
-      def self.config_class() Config ; end
-
-      def upload_validation_key
-        super()
-        if config.upload_client_key
-          # env[:ui].info I18n.t("vagrant.provisioners.chef.upload_client_key")
-          host_client_key = File.expand_path(config.upload_client_key)
-          env[:vm].channel.upload(host_client_key, tmp_client_key_path)
-          env[:vm].channel.sudo("mv #{tmp_client_key_path} #{config.client_key_path}")
-          env[:vm].channel.sudo("chown root #{config.client_key_path}")
-          env[:vm].channel.sudo("chmod 600  #{config.client_key_path}")
-        end
-      end
-
-      def tmp_client_key_path
-        File.join(config.provisioning_path, "client.pem")
-      end
-
-    end
-  end
-end

data/lib/chef/knife/vagrant/skeleton_vagrantfile.rb

@@ -1,119 +0,0 @@
-#
-# ~~ DO NOT EDIT ~~
-#
-
-unless defined?(Chef::Config)
-  puts <<-EOL
-    Warning!
-
-    This might *look* like a vagrantfile.  However it's only useful when you use
-    `knife cluster vm` to manipulate it.  Any changes you put here will be
-    clobbered, and you can't edit the original if you install ironfan as a gem.
-    Annoying, but concentrate on the magic of the jetpack-powered ridiculous
-    cybernetic future magic that's going on here.
-
-    Instead, issue commands like
-
-        knife cluster vagrant COMMAND CLUSTER[-FACET-[INDEXES]]
-
-    Where command is something like
-
-        status up provision reload resume suspend ssh destroy or halt
-
-EOL
-  exit(2)
-end
-
-
-Vagrant::Config.run do |config|
-
-  #
-  # FIXME: the things in this first section need to go somewhere else; need to
-  # learn more abt vagrant to figure out where.
-  #
-
-  # TODO: FIXME: WTF is this hoary horseshit? At *least* do it by cluster-facet,
-  #   not just facet (especially since the examples given are all *clusters*)
-  def ip_for(svr)
-    "#{Chef::Config.host_network_base}.#{(Chef::Config.host_network_ip_mapping[svr.facet_name] || 30) + svr.facet_index}"
-  end
-
-  # FIXME: things like this should be imputed by the `cloud` statement
-  ram_mb           = Chef::Config.vagrant_ram_mb || 640
-  video_ram_mb     = 10
-  cores            = Chef::Config.vagrant_cores  || 2
-
-  # ===========================================================================
-  #
-  # Configure VM
-  #
-
-  # Boot with a GUI so you can see the screen. (Default is headless)
-  #config.vm.boot_mode = :gui
-
-  # Mount this to see all our chefs and stuff: [type, vm_path, host_path]
-  config.vm.share_folder "homebase", Chef::Config.homebase_on_vm_dir, Chef::Config.homebase
-
-  #
-  # Define a VM for all the targeted servers in the cluster.
-  #
-  # * vm name   - server's fullname ('el_ridiculoso-gordo-2')
-  # * vm box    - cloud.image_name
-  # * creates host network on the subnet defined in Chef::Config[:host_network_blk]
-  # * populates chef provisioner from the server's run_list
-  #
-  $ironfan_target.servers.each do |svr|
-    config.vm.define svr.fullname.to_sym do |cfg|
-
-      cfg.vm.box     = svr.cloud.image_name
-      cfg.vm.network  :hostonly, ip_for(svr)
-# TODO: FIXME: Need to set the "private IP" for each vagrant to something distinct for each node
-
-      #
-      # See http://www.virtualbox.org/manual/ch08.html#idp12418752
-      # for the craziness
-      #
-      vm_customizations = {}
-      vm_customizations[:name]   = svr.fullname.to_s
-      vm_customizations[:memory] = ram_mb.to_s       if ram_mb
-      vm_customizations[:vram]   = video_ram_mb.to_s if video_ram_mb
-      vm_customizations[:cpus]   = cores.to_s        if cores
-      # Use the host resolver for DNS so that VPN continues to work within the VM
-      vm_customizations[:natdnshostresolver1] = "on"
-      #
-      cfg.vm.customize ["modifyvm", :id, vm_customizations.map{|k,v| ["--#{k}", v]} ].flatten
-
-      # Assign this VM to a bridged network, allowing you to connect directly to a
-      # network using the host's network device. This makes the VM appear as another
-      # physical device on your network.
-      # cfg.vm.network :bridged
-
-      # Forward a port from the guest to the host, which allows for outside
-      # computers to access the VM, whereas host only networking does not.
-      # cfg.vm.forward_port 80, 8080
-
-      cfg.vm.provision Vagrant::Provisioners::IronfanChefClient do |chef|
-        #
-        chef.node_name              = svr.fullname
-
-        chef.chef_server_url        = svr.chef_server_url
-        chef.validation_client_name = svr.validation_client_name
-        chef.validation_key_path    = svr.validation_key
-        chef.upload_client_key      = svr.client_key.filename if svr.client_key
-
-        chef.environment            = svr.environment
-        chef.json                   = svr.cloud.user_data
-
-        svr.combined_run_list.each do |run_list_entry|
-          case run_list_entry
-          when /^role\[(\w+)\]$/   then chef.add_role($1)                # role[foo]
-          when /^recipe\[(\w+)\]$/ then chef.add_recipe($1)              # recipe[foo]
-          else                          chef.add_recipe(run_list_entry)  # foo
-          end
-        end
-
-      end
-    end
-  end
-
-end