stork 0.1.0.pre → 0.2.0.pre

data/specs/resource_host_spec.rb

@@ -54,270 +54,130 @@ describe "Stork::Resource::Host" do
     Stork::Resource::Host.new.must_respond_to :run_list=
   end
 
+  it "must respond to the chef_environment accessors" do
+    Stork::Resource::Host.new.must_respond_to :chef_environment
+    Stork::Resource::Host.new.must_respond_to :chef_environment=
+  end
+
   it "must respond to the repos accessors" do
     Stork::Resource::Host.new.must_respond_to :repos
     Stork::Resource::Host.new.must_respond_to :repos=
   end
 
-  # it "must raise an error if the template is not found" do
-  #   proc {
-  #     host = Stork::Resource::Host.build configuration, collection, "example.org" do
-  #       template "invalid"
-  #     end
-  #   }.must_raise(SyntaxError)
-  # end
-
-  # it "must raise an error if the snippet is not found for pre" do
-  #   proc {
-  #     host = Stork::Resource::Host.build configuration, collection, "example.org" do
-  #       pre_snippet "invalid"
-  #     end
-  #   }.must_raise(SyntaxError)
-  # end
-
-  # it "must raise an error if the snippet is not found for post" do
-  #   proc {
-  #     host = Stork::Resource::Host.build configuration, collection, "example.org" do
-  #       post_snippet "invalid"
-  #     end
-  #   }.must_raise(SyntaxError)
-  # end
-
-  # it "must raise an error if a block is not passed to firewall" do
-  #   proc {
-  #     host = Stork::Resource::Host.build configuration, collection, "example.org" do
-  #       firewall
-  #     end
-  #   }.must_raise(SyntaxError)
-  # end
-
-  # it "must raise an error if a block is not passed to password" do
-  #   proc {
-  #     host = Stork::Resource::Host.build configuration, collection, "example.org" do
-  #       password
-  #     end
-  #   }.must_raise(SyntaxError)
-  # end
-
-  # it "must build inline" do
-  #   ckey = "./specs/keys/snakeoil-root.pem"
-  #   vkey = "./specs/keys/snakeoil-validation.pem"
-
-  #   host = Stork::Resource::Host.build configuration, collection, "example.org" do
-  #     template "default"
-  #     pxemac "00:11:22:33:44:55"
-
-  #     repo 'foo', baseurl: 'http://foo.com'
-
-  #     distro "centos" do
-  #       kernel "vmlinuz"
-  #       image "initrd.img"
-  #       url "http://mirror.example.com/centos"
-  #     end
-
-  #     layout "default" do
-  #       clearpart
-  #       zerombr
-  #       part "/boot" do
-  #         size 100
-  #         type "ext4"
-  #         primary
-  #       end
-
-  #       part "swap" do
-  #         type "swap"
-  #         primary
-  #         recommended
-  #       end
-
-  #       part "/" do
-  #         size 4096
-  #         type "ext4"
-  #       end
-
-  #       part "/home" do
-  #         size 1
-  #         type "ext4"
-  #         grow
-  #       end
-  #     end
-
-  #     chef "default" do
-  #       url "https://chef.example.org"
-  #       version "11.6.0"
-  #       client_name "root"
-  #       client_key ckey
-  #       validator_name "chef-validator"
-  #       validation_key vkey
-  #       encrypted_data_bag_secret "secretkey"
-  #     end
-
-  #     interface "eth0" do
-  #       bootproto :static
-  #       ip        "192.168.1.10"
-  #       netmask "255.255.255.0"
-  #       gateway "192.168.1.1"
-  #       nameserver "192.168.1.253"
-  #       nameserver "192.168.1.252"
-  #     end
-  #   end
-
-  #   host.name.must_equal "example.org"
-  #   host.pxemac.must_equal "00:11:22:33:44:55"
-  #   host.distro.name.must_equal "centos"
-  #   host.distro.kernel.must_equal "vmlinuz"
-  #   host.distro.image.must_equal "initrd.img"
-  #   host.distro.url.must_equal "http://mirror.example.com/centos"
-  #   host.layout.clearpart.must_equal true
-  #   host.layout.zerombr.must_equal true
-  #   parts = host.layout.partitions
-  #   parts[0].path.must_equal '/boot'
-  #   parts[0].size.must_equal 100
-  #   parts[0].type.must_equal "ext4"
-  #   parts[0].primary.must_equal true
-  #   parts[1].path.must_equal 'swap'
-  #   parts[1].type.must_equal "swap"
-  #   parts[1].recommended.must_equal true
-  #   parts[2].path.must_equal "/"
-  #   parts[2].size.must_equal 4096
-  #   parts[3].path.must_equal "/home"
-  #   parts[3].type.must_equal "ext4"
-  #   parts[3].grow.must_equal true
-  #   host.chef.url.must_equal "https://chef.example.org"
-  #   host.chef.version.must_equal "11.6.0"
-  #   host.chef.client_name.must_equal "root"
-  #   host.chef.client_key.must_equal File.read(ckey)
-  #   host.chef.validator_name.must_equal "chef-validator"
-  #   host.chef.validation_key.must_equal File.read(vkey)
-  #   host.chef.encrypted_data_bag_secret.must_equal "secretkey"
-  #   interface = host.interfaces.first
-  #   interface.device.must_equal "eth0"
-  #   interface.bootproto.must_equal :static
-  #   interface.ip.must_equal "192.168.1.10"
-  #   interface.netmask.must_equal "255.255.255.0"
-  #   interface.gateway.must_equal "192.168.1.1"
-  #   interface.nameservers.must_equal ["192.168.1.253", "192.168.1.252"]
-  # end
-
-  # it "must build with collections" do
-  #   ckey = "./specs/files/configs/keys/snakeoil-root.pem"
-  #   vkey = "./specs/files/configs/keys/snakeoil-validation.pem"
-  #   collection = Midwife::Collection.new
-  #
-  #   distro = Stork::Resource::Distro.build("centos") do
-  #     kernel "vmlinuz"
-  #     image "initrd.img"
-  #     url "http://mirror.example.com/centos"
-  #   end
-  #
-  #   layout = Stork::Resource::Layout.build("default") do
-  #     clearpart
-  #     zerombr
-  #     part "/boot" do
-  #       size 100
-  #       type "ext4"
-  #       primary
-  #     end
-  #
-  #     part "swap" do
-  #       type "swap"
-  #       primary
-  #       recommended
-  #     end
-  #
-  #     part "/" do
-  #       size 4096
-  #       type "ext4"
-  #     end
-  #
-  #     part "/home" do
-  #       size 1
-  #       type "ext4"
-  #       grow
-  #     end
-  #   end
-  #
-  #   chef = Stork::Resource::Chef.build("default") do
-  #     url "https://chef.example.org"
-  #     version "11.6.0"
-  #     client_name "root"
-  #     client_key ckey
-  #     validator_name "chef-validator"
-  #     validation_key vkey
-  #     encrypted_data_bag_secret "secretkey"
-  #   end
-  #
-  #   net = Stork::Resource::Network.build("local") do
-  #     netmask "255.255.255.0"
-  #     gateway "192.168.1.1"
-  #     nameserver "192.168.1.253"
-  #     nameserver "192.168.1.252"
-  #   end
-  #
-  #   snip = Stork::Resource::Snippet.new(File.dirname(__FILE__) + '/files/configs/snippets/noop.erb')
-  #
-  #   collection.distros.add(distro)
-  #   collection.layouts.add(layout)
-  #   collection.chefs.add(chef)
-  #   collection.networks.add(net)
-  #   collection.snippets.add(snip)
-  #
-  #   host = Stork::Resource::Host.build(collection, "example.org") do
-  #     template "default"
-  #     pxemac "00:11:22:33:44:55"
-  #
-  #     distro "centos"
-  #     layout "default"
-  #     chef "default"
-  #
-  #     pre_snippet "noop"
-  #     post_snippet "noop"
-  #
-  #     interface "eth0" do
-  #       bootproto :static
-  #       ip "192.168.1.10"
-  #       network "local"
-  #     end
-  #   end
-  #
-  #   host.name.must_equal "example.org"
-  #   host.pxemac.must_equal "00:11:22:33:44:55"
-  #   host.distro.name.must_equal "centos"
-  #   host.distro.kernel.must_equal "vmlinuz"
-  #   host.distro.image.must_equal "initrd.img"
-  #   host.distro.url.must_equal "http://mirror.example.com/centos"
-  #   host.layout.clearpart.must_equal true
-  #   host.layout.zerombr.must_equal true
-  #   parts = host.layout.partitions
-  #   parts[0].path.must_equal '/boot'
-  #   parts[0].size.must_equal 100
-  #   parts[0].type.must_equal "ext4"
-  #   parts[0].primary.must_equal true
-  #   parts[1].path.must_equal 'swap'
-  #   parts[1].type.must_equal "swap"
-  #   parts[1].recommended.must_equal true
-  #   parts[2].path.must_equal "/"
-  #   parts[2].size.must_equal 4096
-  #   parts[3].path.must_equal "/home"
-  #   parts[3].type.must_equal "ext4"
-  #   parts[3].grow.must_equal true
-  #   host.chef.url.must_equal "https://chef.example.org"
-  #   host.chef.version.must_equal "11.6.0"
-  #   host.chef.client_name.must_equal "root"
-  #   host.chef.client_key.must_equal File.read(ckey)
-  #   host.chef.validator_name.must_equal "chef-validator"
-  #   host.chef.validation_key.must_equal File.read(vkey)
-  #   host.chef.encrypted_data_bag_secret.must_equal "secretkey"
-  #   interface = host.interfaces.first
-  #   interface.device.must_equal "eth0"
-  #   interface.bootproto.must_equal "static"
-  #   interface.ip.must_equal "192.168.1.10"
-  #   interface.netmask.must_equal "255.255.255.0"
-  #   interface.gateway.must_equal "192.168.1.1"
-  #   interface.nameservers.must_equal ["192.168.1.253", "192.168.1.252"]
-  #   host.post_snippets[0].name.must_equal "noop"
-  #   host.post_snippets[0].content.must_equal "# Default Snippet\n"
-  #   host.pre_snippets[0].name.must_equal "noop"
-  #   host.pre_snippets[0].content.must_equal "# Default Snippet\n"
-  # end
+  it "must return a hash with hashify" do
+    host = collection.hosts.get("server.example.org")
+    hash = {   
+      'name' => 'server.example.org', 
+      'distro' => 'centos', 
+      'template' => 'default', 
+      'chef' => 'default',
+      'chef_environment' => 'testing',
+      'layout' => {
+        'partitions' => [
+          { 
+            'path' => '/boot',
+            'size' => 100,
+            'type' => 'ext4',
+            'primary' => true,
+            'grow' => false,
+            'recommended' => false
+          },
+          { 
+            'path' => 'swap',
+            'size' => 1,
+            'type' => 'swap',
+            'primary' => true, 
+            'grow' => false,
+            'recommended' => true
+          }, 
+          { 
+            'path' => '/',
+            'size' => 4096,
+            'type' => 'ext4',
+            'primary' => false,
+            'grow' => false,
+            'recommended' => false
+          },
+          { 
+            'path' => 'pv.01',
+            'size' => 1,
+            'type' => 'ext4',
+            'primary' => false,
+            'grow' => true,
+            'recommended' => false
+          }
+        ],
+        'volume_groups' => [
+          { 
+            'partition' => 'pv.01',
+            'logical_volumes' => [
+              { 
+                'path' => '/home',
+                'size' => 1,
+                'type' => 'ext4',
+                'primary' => nil,
+                'grow' => true,
+                'recommended' => false
+              }
+            ]
+          }
+        ]
+      },
+      'interfaces' => [
+        { 
+          'ip' => '99.99.1.8',
+          'bootproto' => :static,
+          'netmask' => '255.255.255.0',
+          'gateway' => nil,
+          'nameservers' => [],
+          'search_paths' => []
+        },
+        { 
+          'ip' => '192.168.1.10',
+          'bootproto' => :static,
+          'netmask' => '255.255.255.0',
+          'gateway' => '192.168.1.1',
+          'nameservers' => ['192.168.1.253', '192.168.1.252'],
+          'search_paths' => []
+        }
+      ],
+      'pre_snippets' => ['setup'],
+      'post_snippets' => [
+        'ntp',
+        'resolv-conf',
+        'chef-bootstrap',
+        'chef-reconfigure',
+        'notify'
+      ],
+      'repos' => ['whamcloud-client'],
+      'run_list' => ['role[base]', 'recipe[apache]'], 
+      'packages' => [
+        '@core',
+        'curl',
+        'openssh-clients',
+        'openssh-server',
+        'finger',
+        'pciutils',
+        'yum',
+        'at',
+        'acpid',
+        'vixie-cron',
+        'cronie-noanacron',
+        'crontabs',
+        'logrotate',
+        'ntp',
+        'ntpdate',
+        'tmpwatch',
+        'rsync',
+        'mailx',
+        'which',
+        'wget',
+        'man',
+        'foo'
+      ], 
+      'timezone' => 'America/Los_Angeles', 
+      'selinux' => 'enforcing'
+    }
+    host.hashify.must_equal hash
+  end
 end

data/specs/scripts/kssetup.sh

@@ -8,12 +8,12 @@ if [ "$TRAVIS" = "true" ] ; then
   cd pykickstart
   sudo python setup.py install
 else
-  pip install virtualenv
+  # pip install virtualenv
   echo "Creating virtual environment: ksvalidator"
   virtualenv ksvalidator
   cd ksvalidator
   echo "Activating!!!"
-  source bin/activate
+  . ./bin/activate
   echo "Installing packages"
   pip install pycurl
   pip install urlgrabber

data/specs/server_spec.rb

@@ -6,15 +6,20 @@ require 'rack/test'
 include Rack::Test::Methods
 
 def app
-  b = Stork::Builder.load(configuration)
+  b = Stork::Builder.load
   a = Stork::Server::Application
+
+  d = Stork::Database.load('./specs/tmp')
+  d.sync_hosts(b.collection.hosts)
+
   a.set :collection, b.collection
-  a.set :config, configuration
+  a.set :database, d
   a
 end
 
 describe "Stork::Server::Application" do
   before(:each) do
+    load_config
     FileUtils.mkdir('./specs/tmp/pxeboot')
   end
 
@@ -29,14 +34,21 @@ describe "Stork::Server::Application" do
   end
 
   it "should output the kickstart file for a valid host" do
+    get '/host/server.example.org/install'
     get '/host/server.example.org'
     message = "foo"
-    last_response.body.wont_equal "{ \"status\":\"404\", \"message\": \"not found\" }"
+    last_response.body.wont_equal "{ \"status\":\"404\", \"message\": \"Not found\" }"
+  end
+
+  it "should not output the kickstart file when host action is not set to install" do
+    get '/host/server.example.org'
+    message = "foo"
+    last_response.body.must_equal "{ \"status\":\"404\", \"message\": \"Not found\" }"
   end
 
   it "should error for invalid host" do
     get '/host/invalid.org'
-    message = "{ \"status\":\"404\", \"message\": \"not found\" }"
+    message = "{ \"status\":\"404\", \"message\": \"Not found\" }"
     last_response.body.must_equal message
   end
 
@@ -44,41 +56,51 @@ describe "Stork::Server::Application" do
     get '/host/server.example.org/installed'
     last_response.body.must_equal "{ \"status\":\"200\", \"message\": \"OK\" }"
 
-    expected_content = <<-EOS
-DEFAULT local
-PROMPT 0
-TIMEOUT 0
-TOTALTIMEOUT 0
-ONTIMEOUT local
-LABEL local
-        LOCALBOOT -1
-    EOS
+    expected_content = <<-EOS.gsub(/^ {6}/, '')
+      DEFAULT local
+      PROMPT 0
+      TIMEOUT 0
+      TOTALTIMEOUT 0
+      ONTIMEOUT local
+      LABEL local
+              LOCALBOOT 0
+      EOS
     File.read("./specs/tmp/pxeboot/01-00-11-22-33-44-55").must_equal expected_content
   end
 
   it "should error on completed install for invalid host" do
     get '/host/invalid.org/installed'
-    last_response.body.must_equal "{ \"status\":\"404\", \"message\": \"not found\" }"
+    last_response.body.must_equal "{ \"status\":\"404\", \"message\": \"Not found\" }"
+  end
+
+  it "should send a public file" do
+    get '/public/file.txt'
+    last_response.status.must_equal 200
+  end
+
+  it "should give a 404 on a non existant file" do
+    get '/public/error.txt'
+    last_response.status.must_equal 404
   end
 
   it "should notify of an install request" do
     get '/host/server.example.org/install'
     last_response.body.must_equal "{ \"status\":\"200\", \"message\": \"OK\" }"
 
-    expected_content = <<-EOS
-default install
-prompt 0
-timeout 1
-label install
-        kernel vmlinuz
-        ipappend 2
-        append initrd=initrd.img ksdevice=bootif priority=critical kssendmac ks=http://localhost:5000/host/server.example.org
-    EOS
+    expected_content = <<-EOS.gsub(/^ {6}/, '')
+      default install
+      prompt 0
+      timeout 1
+      label install
+              kernel vmlinuz
+              ipappend 2
+              append initrd=initrd.img ksdevice=bootif priority=critical kssendmac ks=http://localhost:5000/host/server.example.org
+      EOS
     File.read("./specs/tmp/pxeboot/01-00-11-22-33-44-55").must_equal expected_content
   end
 
   it "should error for invalid host" do
     get '/host/invalid.org/install'
-    last_response.body.must_equal "{ \"status\":\"404\", \"message\": \"not found\" }"
+    last_response.body.must_equal "{ \"status\":\"404\", \"message\": \"Not found\" }"
   end
 end

data/specs/spec_helper.rb

@@ -24,10 +24,11 @@ if ENV['DEBUG']
   require 'minitest/debugger'
 end
 
-def configuration
+def load_config
+  Stork::Configuration.reset
   Stork::Configuration.from_file('./specs/stork/config.rb')
 end
 
 def collection
-  Stork::Builder.load(configuration).collection
+  Stork::Builder.load.collection
 end

data/specs/stork/bundles/hosts/example.org.rb

@@ -32,6 +32,7 @@ host "server.example.org" do
   post_snippet   "notify"
 
   run_list %w{ role[base] recipe[apache] }
+  chef_environment "testing"
 end
 
 hosts=[
@@ -48,7 +49,7 @@ hosts=[
 ]
 
 hosts.each do |octet, mac|
-  host "n0#{octet}.example.org" do
+  host "c0#{octet}.example.org" do
     template    "default"
     chef        "default"
     distro      "centos"

data/specs/stork/bundles/public/file.txt

@@ -0,0 +1,5 @@
+# file.txt
+
+This is a regularly scheduled test of the emergency broadcast system.
+
+This is a test.  This is only a test.

data/specs/stork/config.rb

@@ -3,6 +3,7 @@ path                    "./specs/stork"
 bundle_path             "./specs/stork/bundles"
 authorized_keys_file    "./specs/stork/authorized_keys"
 pxe_path                "./specs/tmp/pxeboot"
+db_path                 "./specs/tmp"
 log_file                "./specs/tmp/stork.log"
 pid_file                "./specs/tmp/stork.pid"
 server                  "localhost"

data/stork.gemspec

@@ -19,13 +19,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "sinatra"
-  spec.add_runtime_dependency "thin"
+  spec.add_runtime_dependency "webrick"
   spec.add_runtime_dependency "sqlite3"
   spec.add_runtime_dependency "rest-client"
   spec.add_runtime_dependency "highline"
+  spec.add_runtime_dependency "mixlib-config"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "yard"
   spec.add_development_dependency "minitest", "~> 4.7.3"
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "simplecov"