stork 0.1.0.pre → 0.2.0.pre

data/lib/stork/client/plugins/host_show.rb

@@ -5,7 +5,7 @@ module HostShowPlugin
     def run
       host = args.shift
       raise SyntaxError, "A host must be supplied" if host.nil?
-      data = fetch("/host/#{host}")
+      data = fetch("host/#{host}")
       show('name', data)
       show('distro', data)
       show('template', data)

data/lib/stork/client/plugins/host_sync.rb

@@ -0,0 +1,16 @@
+module HostSyncPlugin
+  class HostSync < Stork::Plugin
+    banner "stork host sync (options)"
+
+    def run
+      response = RestClient.get "#{stork}/api/v1/sync"
+      if response.code == 200
+        puts "OK"
+      else
+        data = JSON.parse(response)
+        puts "Error: #{data['message']}"
+        exit 1
+      end
+    end
+  end
+end

data/lib/stork/collections.rb

@@ -8,6 +8,7 @@ require 'stork/collection/snippets'
 require 'stork/collection/templates'
 
 module Stork
+  # A simple container for all of the resource collections
   class Collections
     attr_reader :hosts
     attr_reader :layouts

data/lib/stork/configuration.rb

@@ -1,98 +1,57 @@
+require 'mixlib/config'
+
 module Stork
   class Configuration
-    attr_accessor :path
-    attr_accessor :bundle_path
-    attr_accessor :authorized_keys_file
-    attr_accessor :pxe_path
-    attr_accessor :log_file
-    attr_accessor :pid_file
-    attr_accessor :server
-    attr_accessor :port
-    attr_accessor :bind
-    attr_accessor :timezone
-
-    def initialize
-      @path                 = '/etc/stork'
-      @authorized_keys_file = path + '/authorized_keys'
-      @bundle_path          = path + '/bundles'
-
-      @pxe_path             = '/var/lib/tftpboot/pxelinux.cfg'
-      @log_file             = '/var/log/stork.log'
-      @pid_file             = '/var/run/stork.pid'
-
-      @server               = 'localhost'
-      @port                 = 9293
-      @bind                 = '0.0.0.0'
-      @timezone             = 'America/Los_Angeles'
-    end
-
-    def hosts_path
-      bundle_path + '/hosts'
-    end
-
-    def snippets_path
-      bundle_path + '/snippets'
-    end
-
-    def layouts_path
-      bundle_path + '/layouts'
-    end
-
-    def networks_path
-      bundle_path + '/networks'
-    end
-
-    def distros_path
-      bundle_path + '/distros'
-    end
-
-    def templates_path
-      bundle_path + '/templates'
-    end
-
-    def chefs_path
-      bundle_path + '/chefs'
-    end
-
-    def to_file
-      <<-EOS
-# Stork configuration file"
-path                    "#{path}"
-bundle_path             "#{bundle_path}"
-authorized_keys_file    "#{authorized_keys_file}"
-pxe_path                "#{pxe_path}"
-log_file                "#{log_file}"
-pid_file                "#{pid_file}"
-server                  "#{server}"
-port                    #{port}
-bind                    "#{bind}"
-timezone                "#{timezone}"
+    extend Mixlib::Config
+    config_strict_mode true
+
+    default :path, '/etc/stork'
+    default :bundle_path, '/etc/stork/bundles'
+    default :authorized_keys_file, '/etc/stork/authorized_keys'
+    default :pxe_path, '/var/lib/tftpboot/pxelinux.cfg'
+    default :log_file, '/var/log/stork.log'
+    default :pid_file, '/var/run/stork.pid'
+    default :timezone, 'America/Los_Angeles'
+    default :db_path, '/var/lib/stork'
+
+    default :server, 'localhost'
+    default :port, 9293
+    default :bind, '0.0.0.0'
+    
+    def self.relative_to_bundle_path(path)
+      File.join(self.configuration[:bundle_path], path)
+    end
+
+    default(:hosts_path) { relative_to_bundle_path('hosts') }
+    default(:snippets_path) { relative_to_bundle_path('snippets') }
+    default(:layouts_path) { relative_to_bundle_path('layouts') }
+    default(:networks_path) { relative_to_bundle_path('networks') }
+    default(:templates_path) { relative_to_bundle_path('templates') }
+    default(:chefs_path) { relative_to_bundle_path('chefs') }
+    default(:distros_path) { relative_to_bundle_path('distros') }
+    default(:public_path) { relative_to_bundle_path('public') }
+    default(:client_name) { 'root' }
+    default(:client_key) { '~/.stork/root.pem' }
+    default(:stork_server_url) { "http://#{self.configuration[:server]}:#{self.configuration[:port]}" } 
+
+    # Only used for the server.  Clients will use a plugin to
+    # interactively set the parameters or create it manually.
+    def self.to_file(config_path)
+      content = <<-EOS.gsub(/^ {8}/, '')
+        # Stork configuration file
+        path                    "#{path}"
+        bundle_path             "#{bundle_path}"
+        authorized_keys_file    "#{authorized_keys_file}"
+        pxe_path                "#{pxe_path}"
+        db_path                 "#{db_path}"
+        log_file                "#{log_file}"
+        pid_file                "#{pid_file}"
+        server                  "#{server}"
+        port                    #{port}
+        bind                    "#{bind}"
+        timezone                "#{timezone}"
       EOS
-    end
-
-    def self.from_file(filename)
-      find_or_create(filename)
-    end
-
-    def self.find_or_create(filename)
-      config = new
-      if File.exist?(filename)
-        delegator = ConfigDelegator.new(config)
-        delegator.instance_eval(File.read(filename), filename)
-      else
-        File.open(filename, 'w') { |file| file.write(config.to_file) }
-      end
-      config
-    end
-
-    class ConfigDelegator
-      def initialize(obj)
-        @delegated = obj
-      end
-
-      def method_missing(meth, *args)
-        @delegated.send("#{meth}=", *args)
-      end
+      File.open(config_path,'w') { |f| f.write(content) }
     end
   end
 end

data/lib/stork/database.rb

@@ -0,0 +1,96 @@
+require 'sqlite3'
+
+module Stork
+  class Database
+    def initialize(dbpath)
+      unless Dir.exists?(dbpath)
+        FileUtils.mkdir_p(dbpath)
+      end
+
+      @db = SQLite3::Database.open(File.join(dbpath, 'stork.db'))
+    end
+
+    def create_tables
+      sql = <<-SQL
+        CREATE TABLE IF NOT EXISTS hosts(
+          name TEXT PRIMARY KEY,
+          action TEXT
+        )
+      SQL
+      execute sql
+    end
+
+    def execute(sql, *args)
+      @db.execute(sql, args)
+    end
+
+    def find(sql, *args)
+      h = Array.new
+
+      stmt = @db.prepare(sql)
+      stmt.execute(*args) do |rows|
+        rows.each do |row|
+          h << {
+            :name => row[0],
+            :action => row[1]
+          }
+        end
+      end
+
+      h
+    end
+
+    def find_one(sql, *args)
+      stmt = @db.prepare(sql)
+      result = stmt.execute(*args)
+
+      if result
+        result.first
+      else
+        nil
+      end
+    end
+
+    def host(name)
+      sql = 'SELECT * FROM hosts WHERE name=?'
+      host = find_one(sql, name)
+
+      if host
+        { :name => host[0], :action => host[1] }
+      else
+        nil
+      end
+    end
+
+    def hosts
+      sql = 'SELECT * FROM hosts ORDER BY name ASC'
+      find(sql)
+    end
+
+    def boot_install(name)
+      sql = "UPDATE hosts SET action='install' WHERE name=?"
+      execute sql, name 
+    end
+
+    def boot_local(name)
+      sql = "UPDATE hosts SET action='localboot' WHERE name=?"
+      execute sql, name
+    end
+
+    def sync_hosts(hosts)
+      hosts.each do |h|
+        result = host(h.name)
+        unless result
+          sql = "INSERT INTO hosts(name,action) VALUES(?, 'localboot')" 
+          execute sql, h.name
+        end
+      end
+    end
+
+    def self.load(dbpath)
+      @db = new(dbpath).tap do |d|
+        d.create_tables
+      end
+    end
+  end
+end

data/lib/stork/deploy/command.rb

@@ -29,6 +29,14 @@ module Stork
         end
       end
 
+      def option_no_equal(opt, value)
+        if value.is_a?(Array)
+          @options << "--#{opt} #{value.join(',')}" unless value.empty?
+        else
+          @options << "--#{opt} #{value}" if value
+        end
+      end
+
       def yes_no(opt, value)
         @options << "--#{opt}=#{value ? 'yes' : 'no'}" if value
       end

data/lib/stork/deploy/install_script.rb

@@ -1,12 +1,11 @@
 module Stork
   module Deploy
     class InstallScript
-      attr_reader :type, :host, :configuration
+      attr_reader :type, :host
 
       def initialize(host, type=:kickstart)
         @host = host
         @type = type
-        @configuration = host.configuration
       end
 
       def render
@@ -21,13 +20,12 @@ module Stork
         def_delegators :@builder, :url, :network, :password, :firewall,
           :timezone, :selinux, :layout, :partitions, :repos, :volume_groups,
           :packages, :pre_snippets, :post_snippets
-        attr_reader :host, :configuration
+        attr_reader :host
 
         def initialize(type, host)
           # puts Stork::Deploy::Commands.constants.inspect
           @builder = Stork::Deploy.const_get("#{type.to_s.capitalize}Binding").new(host)
-          @configuration = configuration
-          @host = host.configuration
+          @host = host
         end
 
         def get_binding

data/lib/stork/deploy/kickstart_binding.rb

@@ -1,16 +1,15 @@
 module Stork
   module Deploy
     class KickstartBinding
-      attr_reader :host, :configuration
+      attr_reader :host
 
       def initialize(host)
         @host = host
-        @configuration = host.configuration
       end
 
       def url
         Command.create 'url' do |c|
-          c.option 'url', host.distro.url
+          c.option_no_equal 'url', host.distro.url
         end
       end
 
@@ -211,9 +210,8 @@ module Stork
           # Render me!!!
           renderer = ERB.new(snippet.content, nil, '-')
           lines << renderer.result(
-            Stork::Deploy::SnippetBinding.new(
-              @configuration, host).get_binding
-            )
+            Stork::Deploy::SnippetBinding.new(host).get_binding
+          )
         end
         lines.join("\n")
       end

data/lib/stork/deploy/section.rb

@@ -4,20 +4,24 @@ module Stork
       def initialize(name, options)
         @name = name
         @options = options
-        @contents = Array.new
+        @contents = []
       end
 
       def to_s
-        str = "%#{@name}"
-        @options.each { |key, value| str += " --#{key}=#{value}" }
-        str += "\n"
-        str += @contents.join("\n")
-        str += "\n%end"
+        if @contents.empty?
+          str = ""
+        else
+          str = "%#{@name}"
+          @options.each { |key, value| str += " --#{key}=#{value}" }
+          str += "\n"
+          str += @contents.join("\n")
+          str += "\n%end"
+        end
         str
       end
 
       def content(content)
-        @contents << content
+        @contents << content unless content.empty?
       end
 
       def self.create(name, opts={}, &block)

data/lib/stork/deploy/snippet_binding.rb

@@ -3,9 +3,8 @@ module Stork
     class SnippetBinding
       attr_reader :host
 
-      def initialize(configuration, host)
+      def initialize(host)
         @host = host
-        @configuration = configuration
       end
 
       def get_binding
@@ -17,11 +16,12 @@ module Stork
       end
 
       def authorized_keys
-        File.read(@configuration.authorized_keys_file)
+        File.read(Configuration[:authorized_keys_file])
       end
 
       def first_boot_content
-        run_list = { 'run_list' => host.run_list }
+        run_list = {}
+        run_list['run_list'] = host.run_list
         run_list.to_json
       end
 
@@ -33,17 +33,22 @@ module Stork
         host.interfaces.map { |x| x.search_paths }.uniq.flatten
       end
 
-      def midwife_server
-        @configuration.server
+      def stork_server
+        Configuration[:server]
       end
 
-      def midwife_port
-        @configuration.port
+      def stork_port
+        Configuration[:port]
       end
 
-      def midwife_bind
-        @configuration.bind
+      def stork_bind
+        Configuration[:bind]
       end
+
+      # Add aliases for old midwife methods
+      alias_method :midwife_server, :stork_server
+      alias_method :midwife_port, :stork_port
+      alias_method :midwife_bind, :stork_bind
     end
   end
 end

data/lib/stork/plugin.rb

@@ -23,12 +23,19 @@ module Stork
       @banner
     end
 
-    def initialize(configuration, options, args)
+    def initialize(options, args)
       @action = nil
-      @configuration = configuration
       @options = options
       @args = args
-      @stork = "http://#{configuration.server}:#{configuration.port}"
+      @stork = "http://#{Configuration[:server]}:#{Configuration[:port]}"
+    end
+
+    def config
+      Stork::Configuration.client
+    end
+
+    def url
+      Stork::Configuration.url
     end
 
     def fetch(path)
@@ -36,11 +43,23 @@ module Stork
       data = JSON.parse(response)
     end
 
+    def print(first, second, options = {})
+      padding = options.has_key?(:pad) ? options[:pad] : 16
+      say("<%= color('#{first.ljust(padding)}:', CYAN) %> #{second}")
+    end
+
     def show(key, data, options = {})
-      padding = options.has_key?('pad') ? options['pad'] : 16
+      padding = options.has_key?(:pad) ? options[:pad] : 16
       name = key.split('_').map{|k| k.capitalize}.join(' ').ljust(padding)
+
       if data[key].is_a?(Array)
-        value = data[key].join(', ')
+        if data[key].empty?
+          value = "** empty **"
+        else
+          value = data[key].join(', ')
+        end
+      elsif data[key].is_a?(NilClass)
+        value = "Unset"
       else
         value = data[key]
       end

data/lib/stork/pxe.rb

@@ -15,7 +15,7 @@ module Stork
       @hostname = host.name
       @initrd = host.distro.image
       @kernel = host.distro.kernel
-      @path = host.configuration.pxe_path
+      @path = Configuration[:pxe_path]
       @mac = host.pxemac
       @server = server
       @port = port
@@ -53,7 +53,7 @@ TIMEOUT 0
 TOTALTIMEOUT 0
 ONTIMEOUT local
 LABEL local
-        LOCALBOOT -1
+        LOCALBOOT 0
       EOS
     end
 

data/lib/stork/resource/base.rb

@@ -3,11 +3,9 @@ module Stork
     class Base
       attr_reader :name
       attr_reader :options
-      attr_reader :configuration
 
       def initialize(name = nil, options = {})
         @name = name
-        @configuration = options[:configuration]
         @options = options
         setup
       end

data/lib/stork/resource/delegator.rb

@@ -2,13 +2,11 @@ module Stork
   module Resource
     class Delegator
       attr_reader :collection
-      attr_reader :configuration
       attr_reader :delegated
 
       def initialize(inst, options)
         @delegated = inst
         @collection = options[:collection]
-        @configuration = options[:configuration]
       end
 
       def get_collection_item(name, value)

data/lib/stork/resource/host.rb

@@ -15,6 +15,7 @@ module Stork
       attr_accessor :selinux
       attr_accessor :packages
       attr_accessor :run_list
+      attr_accessor :chef_environment
       attr_accessor :repos
       attr_accessor :stork
 
@@ -26,12 +27,13 @@ module Stork
         @chef = nil
         @pxemac = nil
         @selinux = 'enforcing'
-        @stork = configuration ? configuration.server : 'localhost'
+        @stork = Configuration[:server]
         
         @pre_snippets = Array.new
         @post_snippets = Array.new
         @interfaces = Array.new
         @run_list = Array.new
+        @chef_environment = '_default'
         @repos = Array.new
         @packages = default_packages
         
@@ -41,24 +43,22 @@ module Stork
       end
 
       def hashify
-        attrs = {}
-        attrs['name'] = name
-        
-        attrs['distro'] = distro ? distro.name : ''
-        attrs['template'] = template ? template.name : ''
-        attrs['chef'] = chef ? chef.name : ''
-
-        attrs['layout'] = layout.hashify
-        attrs['interfaces'] = interfaces.map{|i| i.hashify}
-        attrs['pre_snippets'] = pre_snippets.map{|s| s.name}
-        attrs['post_snippets'] = post_snippets.map{|s| s.name}
-        
-        attrs['repos'] = repos.map{|r| r.name}
-        attrs['run_list'] = run_list
-        attrs['packages'] = packages
-        attrs['timezone'] = timezone.zone
-        attrs['selinux'] = selinux
-        attrs
+        {
+          'name'          => name,
+          'distro'        => distro ? distro.name : '',
+          'template'      => template ? template.name : '',
+          'chef'          => chef ? chef.name : '',
+          'layout'        => layout.hashify,
+          'interfaces'    => interfaces.map{|i| i.hashify},
+          'pre_snippets'  => pre_snippets.map{|s| s.name},
+          'post_snippets' => post_snippets.map{|s| s.name},
+          'repos'         => repos.map{|r| r.name},
+          'run_list'      => run_list,
+          'chef_environment'   => chef_environment,
+          'packages'      => packages,
+          'timezone'      => timezone.zone,
+          'selinux'       => selinux
+        }
       end
 
       def validate!
@@ -95,10 +95,6 @@ module Stork
         )
       end
 
-      def deploy
-        Stork::Deploy::Kickstart.new(self, configuration)
-      end
-
       class HostDelegator < Stork::Resource::Delegator
         def layout(value, &block)
           if block_given?
@@ -187,6 +183,10 @@ module Stork
           delegated.run_list |= list
         end
 
+        def chef_environment(value)
+          delegated.chef_environment = value
+        end
+
         def repo(name, args = {})
           delegated.repos << Repo.build(name, args)
         end

data/lib/stork/resource/logical_volume.rb

@@ -12,7 +12,7 @@ module Stork
         @size = 1
         @type = 'ext4'
         @grow = false
-        @recommended = true
+        @recommended = false
         @path = '/'
       end