stork 0.2.0.pre → 0.3.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c25720b623362f9066503a5134f8e43bd657d55e
-  data.tar.gz: 6ef866902b3736eec018d0fef07ee4fe221a3d36
+  metadata.gz: eb70dddbdd8452f89e72c5430a152525ffde4a8d
+  data.tar.gz: 9f4ea640d74fb77973d86abee6c564067a1433f2
 SHA512:
-  metadata.gz: 728bc4a4d5b8f6f3c7bf139d4fd7ca7678f98aa73b15388d55b851f8e0e9bcb5bb32f8a75626b20ab1a2b2a5c5b074537cbd024b1a20da8008b4a9d011bf0ebb
-  data.tar.gz: 78f163a2fa584dac08c8581ebfa8ad0464a92332618392704e1ae91b1ef3742b5fb5319721b83907b5c70e38eeade5545251e710cb8e86f1876172915bc069f9
+  metadata.gz: 11a458fd20ac0204fcaba0fc150495321023017411123ca7acc5d11c2ea7e4f88609db88a98fae780f0823d0a7a0c3dd56a2acb4eac1ca1c676bcfcab87de73f
+  data.tar.gz: 1b84d3ebeb8cfc2f3f5aa5e960830717b053f107facbf51fdecad700da0b76b3fa29daf20409ae52c8bc1ee347a5b34171e3a0e113dd6c36d0fb9c2c9225c2e7

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.4.4

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 2.1.1
-  - 2.0.0
-  - 1.9.3
+  - 2.4.0
 
-before_script: bundle exec rake ksvalidator:setup
+sudo: false
+dist: trusty
+
+before_script: 
+  - rake ksvalidator:setup
 
-notifications:
-  hipchat: ac943dbb9ee5b4a2562d4476987a91@Stork

data/README.md

@@ -2,6 +2,7 @@
 [![Build Status](https://travis-ci.org/rlyon/stork.png?branch=master)](https://travis-ci.org/rlyon/stork)
 [![Coverage Status](https://coveralls.io/repos/rlyon/stork/badge.png)](https://coveralls.io/r/rlyon/stork)
 [![Code Climate](https://codeclimate.com/github/rlyon/stork.png)](https://codeclimate.com/github/rlyon/stork)
+[![Gem Version](http://img.shields.io/gem/v/stork.svg)](https://rubygems.org/gems/stork)
 
 Stork is a autoinstall utility, kickstart generation tool and server for CentOS and Redhat systems.  It aims to fill the gap in the bare metal systems deployment that many of the other tools for cloud and virtual systems excel at.
 
@@ -54,7 +55,6 @@ where
 
 * ```layout``` - Disk layout containing partition and volume group information.  You can supply a string or a block value.  If a string is supplied stork will attempt to find the id matching a previously defined layout.
 * ```template``` - The kickstart template to use when generating the autoinstallation instructions
-* ```chef``` - Chef server information.  You can supply a string or a block value.  If a string is supplied stork will attempt to find the id matching a previously defined chef server.
 * ```pxemac``` - The mac address of the PXE enabled interface.  Used to create the boot configuration files.
 * ```pre_snippet``` - Scripts that will be run in the **pre** section before the install begins.  Snippets are accessed by the basename of the file they are stored in.
 * ```post_snippet``` - Scripts that will be run in the **post** section afer the install has successfully completed.  Snippets are accessed by the basename of the file they are stored in.
@@ -64,8 +64,6 @@ where
 * ```firewall``` - Initial firewall settings.  Block only.
 * ```selinux``` - String or symbol value representing the three selinux states. The only valid values are:  enforcing, permissive, or disabled.  Default is enforcing.
 * ```package``` - Adds a package to the install.  Generally not needed as the minimal set of packages that are installed by default will be enough to install the configuration management software.
-* ```run_list``` - Chef runlist items that will populate the first-boot.json file.  Can be an array or string value.
-* ```chef_environment``` - A string value representing the chef environment the system is part of.  Defaults to the '_default' environment.
 * ```repos``` - Add a new repo to the host.
 * ```stork``` - Url.  Override the stork server location.
 
@@ -76,7 +74,6 @@ Typical hosts will look like:
 ```ruby
 host "server.example.org" do
   template    "default"
-  chef        "default"
   pxemac      "00:11:22:33:44:55"
   layout      "home"
   distro      "centos"
@@ -102,11 +99,7 @@ host "server.example.org" do
   pre_snippet    "setup"
   post_snippet   "ntp"
   post_snippet   "resolv-conf"
-  post_snippet   "chef-bootstrap"
-  post_snippet   "chef-reconfigure"
   post_snippet   "notify"
-
-  run_list %w{ role[base] recipe[apache] }
 end
 ```
 
@@ -129,7 +122,6 @@ hosts=[
 hosts.each do |octet, mac|
   host "c0#{octet}.example.org" do
     template    "default"
-    chef        "default"
     distro      "centos"
     pxemac      mac
     layout      "home"
@@ -140,7 +132,6 @@ hosts.each do |octet, mac|
       ip        "192.168.10.#{octet}"
       network   "org"
     end
-    run_list %w{ role[node] }
   end
 end
 ```
@@ -463,48 +454,6 @@ firewall do
 end
 ```
 
-## Defining the chef resources
-
-### ```chef```
-
-#### Syntax:
-
-The syntax for the **chef** resource is as follows:
-
-```ruby
-chef "name" do
-  attribute "value"
-end
-```
-
-where
-
-* ```name``` is a unique name that can be used to define global resources that can be referenced from other resources by the defined name.
-* ```attribute``` is the attributes available for this resource
-
-#### Attributes:
-
-* ```version``` - The version of chef to use.
-* ```client_name``` - The admin client name.
-* ```client_key``` - The admin client key file.
-* ```validator_name``` - The validation client name.
-* ```validation_key``` - The validation key file.
-* ```encrypted_data_bag_secret``` - A string value of the data bag encryption key.
-
-#### Examples:
-
-```ruby
-chef "default" do
-  url "https://chef.example.org"
-  version "11.6.0"
-  client_name "root"
-  client_key "./specs/keys/snakeoil-root.pem"
-  validator_name "chef-validator"
-  validation_key "./specs/keys/snakeoil-validation.pem"
-  encrypted_data_bag_secret "9EE8rGyPB8mXARNrzSDal9TOAQ...e7/x2uPkqMS/tOU="
-end
-```
-
 ## Templates and Snippet Scripts
 
 Templates and snippets use the ERB templating system.  When the ERB files are rendered, binding are created to expose ruby the underlying ruby objects.  
@@ -533,7 +482,6 @@ In addition to the kickstart command generators, the following objects are expos
 Snippets expose the following objects to the template:
 
 * ```host``` - The current host.
-* ```chef``` - The chef object.
 * ```authorized_keys``` - A string containing all the public keys.
 * ```first_boot_content``` - A string representation of the json content that will make up the first_boot file.
 * ```nameservers``` - An array of all unique nameservers.

data/Rakefile

@@ -13,9 +13,7 @@ namespace :ksvalidator do
   desc 'Set up the validation directories and environment.'
   task :setup do
     spath = File.join(File.dirname(__FILE__), 'specs', 'scripts', 'kssetup.sh')
-    vpath = File.join(File.dirname(__FILE__), 'specs')
-    puts "Setting up in #{vpath}"
-    system("mkdir -p #{vpath} ; cd #{vpath} ; sh #{spath}")
+    system("sh #{spath}")
   end
 
   task :clean do

data/lib/stork/builder.rb

@@ -27,7 +27,6 @@ module Stork
 
       load_paths = [
         Configuration[:distros_path],
-        Configuration[:chefs_path],
         Configuration[:networks_path],
         Configuration[:layouts_path],
         Configuration[:hosts_path]
@@ -42,7 +41,7 @@ module Stork
     end
 
     # Expose a limited number of resource methods for DSL parsing from 
-    # files.  Allow delegation of the host, layout, network, chef, distro, 
+    # files.  Allow delegation of the host, layout, network, distro, 
     # templates and snippets blocks.
     #
     # == Parameters
@@ -98,19 +97,6 @@ module Stork
         )
       end
 
-      # Build and add a chef server to the resource collection.
-      #
-      # == Parameters:
-      # name::
-      #   A unique name to identify the chef server.
-      #
-      #
-      def chef(name, &block)
-        @delegated.collection.chefs.add(
-          Resource::Chef.build(name, &block)
-        )
-      end
-
       # Build and add a distro to the resource collection.
       #
       # == Parameters:

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

@@ -9,8 +9,6 @@ module HostShowPlugin
       show('name', data)
       show('distro', data)
       show('template', data)
-      show('chef', data)
-      show('run_list', data)
       show('pre_snippets', data)
       show('post_snippets', data)
       show('packages', data)

data/lib/stork/collections.rb

@@ -1,5 +1,4 @@
 require 'stork/collection/base'
-require 'stork/collection/chefs'
 require 'stork/collection/distros'
 require 'stork/collection/hosts'
 require 'stork/collection/layouts'
@@ -13,7 +12,6 @@ module Stork
     attr_reader :hosts
     attr_reader :layouts
     attr_reader :networks
-    attr_reader :chefs
     attr_reader :distros
     attr_reader :snippets
     attr_reader :templates
@@ -22,7 +20,6 @@ module Stork
       @hosts = Stork::Collection::Hosts.new
       @layouts = Stork::Collection::Layouts.new
       @networks = Stork::Collection::Networks.new
-      @chefs = Stork::Collection::Chefs.new
       @distros = Stork::Collection::Distros.new
       @snippets = Stork::Collection::Snippets.new
       @templates = Stork::Collection::Templates.new
@@ -31,7 +28,6 @@ module Stork
     alias_method :network, :networks
     alias_method :layout, :layouts
     alias_method :host, :hosts
-    alias_method :chef, :chefs
     alias_method :distro, :distros
     alias_method :snippet, :snippets
     alias_method :template, :templates

data/lib/stork/configuration.rb

@@ -27,7 +27,6 @@ module Stork
     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' }

data/lib/stork/database.rb

@@ -3,7 +3,7 @@ require 'sqlite3'
 module Stork
   class Database
     def initialize(dbpath)
-      unless Dir.exists?(dbpath)
+      unless Dir.exist?(dbpath)
         FileUtils.mkdir_p(dbpath)
       end
 

data/lib/stork/deploy/snippet_binding.rb

@@ -11,20 +11,10 @@ module Stork
         binding
       end
 
-      def chef
-        host.chef
-      end
-
       def authorized_keys
         File.read(Configuration[:authorized_keys_file])
       end
 
-      def first_boot_content
-        run_list = {}
-        run_list['run_list'] = host.run_list
-        run_list.to_json
-      end
-
       def nameservers
         host.interfaces.map { |x| x.nameservers }.uniq.flatten
       end

data/lib/stork/plugin.rb

@@ -40,7 +40,7 @@ module Stork
 
     def fetch(path)
       response = RestClient.get "#{@stork}/api/v1/#{path}"
-      data = JSON.parse(response)
+      JSON.parse(response)
     end
 
     def print(first, second, options = {})

data/lib/stork/resource/base.rb

@@ -1,3 +1,5 @@
+require "ipaddr"
+
 module Stork
   module Resource
     class Base
@@ -24,6 +26,29 @@ module Stork
         fail SyntaxError, "#{attr} is required" if send(attr).nil?
       end
 
+      def require_valid_ips(attr)
+        values = send(attr)
+        values.each do |value|
+          fail SyntaxError, "#{value} is not a valid address" unless is_valid_ip?(value)
+        end
+      end
+
+      def require_valid_ip(attr)
+        value = send(attr)
+        if value
+          fail SyntaxError, "#{value} is not a valid address" unless is_valid_ip?(value)
+        end
+      end
+
+      def is_valid_ip?(ipaddr)
+        begin
+          IPAddr.new ipaddr
+          true
+        rescue IPAddr::InvalidAddressError
+          false
+        end
+      end
+
       def self.build(name = nil, options = {}, &block)
         inst = new(name, options)
         klass_name = self.to_s.split('::').last

data/lib/stork/resource/host.rb

@@ -3,7 +3,6 @@ module Stork
     class Host < Base
       attr_accessor :layout
       attr_accessor :template
-      attr_accessor :chef
       attr_accessor :pxemac
       attr_accessor :pre_snippets
       attr_accessor :post_snippets
@@ -14,17 +13,16 @@ module Stork
       attr_accessor :password
       attr_accessor :selinux
       attr_accessor :packages
-      attr_accessor :run_list
-      attr_accessor :chef_environment
       attr_accessor :repos
       attr_accessor :stork
+      attr_accessor :tags
+      attr_accessor :environments
 
       def setup
         @layout = nil
         @template = nil
         @distro = nil
 
-        @chef = nil
         @pxemac = nil
         @selinux = 'enforcing'
         @stork = Configuration[:server]
@@ -32,10 +30,10 @@ module Stork
         @pre_snippets = Array.new
         @post_snippets = Array.new
         @interfaces = Array.new
-        @run_list = Array.new
-        @chef_environment = '_default'
         @repos = Array.new
         @packages = default_packages
+        @tags = Array.new
+        @environments = Array.new
         
         @timezone = Timezone.new("America/Los_Angeles")
         @firewall = Firewall.new # get from config
@@ -47,17 +45,16 @@ module Stork
           '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
+          'selinux'       => selinux,
+          'tags'          => tags,
+          'environments'  => environments
         }
       end
 
@@ -112,14 +109,6 @@ module Stork
           delegated.template = template
         end
 
-        def chef(value, &block)
-          if block_given?
-            delegated.chef = Chef.build(value, &block)
-          else
-            delegated.chef = collection.chefs.get(value)
-          end
-        end
-
         def pxemac(value)
           delegated.pxemac = value
         end
@@ -174,19 +163,6 @@ module Stork
           delegated.selinux = value.to_s
         end
 
-        def run_list(value)
-          if value.is_a?(String)
-            list = value.split(',')
-          else
-            list = value
-          end
-          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
@@ -194,6 +170,14 @@ module Stork
         def package(name)
           delegated.packages << name
         end
+
+        def tags(tag)
+          delegated.tags << tag
+        end
+
+        def environments(name)
+          delegated.environments << name
+        end
       end
 
       alias_method :id, :name

data/lib/stork/resource/interface.rb

@@ -25,7 +25,7 @@ module Stork
       end
 
       def validate!
-
+        require_valid_ip :ip
       end
 
       def netmask

data/lib/stork/resource/network.rb

@@ -1,3 +1,5 @@
+require "ipaddr"
+
 module Stork
   module Resource
     class Network < Base
@@ -13,7 +15,17 @@ module Stork
         @search_paths = Array.new
       end
 
+      def validate!
+        require_valid_ips :nameservers
+        require_valid_ip :gateway
+        require_valid_ip :netmask
+      end
+
       class NetworkDelegator < Stork::Resource::Delegator
+        def network(network)
+          delegated.network = network
+        end
+
         def netmask(netmask)
           delegated.netmask = netmask
         end