stork 0.2.0.pre → 0.3.0.pre

data/lib/stork/resources.rb

@@ -1,6 +1,5 @@
 require 'stork/resource/delegator'
 require 'stork/resource/base'
-require 'stork/resource/chef'
 require 'stork/resource/distro'
 require 'stork/resource/partition'
 require 'stork/resource/logical_volume'

data/lib/stork/version.rb

@@ -1,4 +1,4 @@
 module Stork
-  VERSION = '0.2.0.pre'
+  VERSION = '0.3.0.pre'
   CODENAME = 'Psychotic Hamster'
 end

data/specs/builder_spec.rb

@@ -9,7 +9,6 @@ describe "Stork::Builder" do
     builder = Stork::Builder.load
     collection = builder.collection
     collection.hosts.size.must_equal 11
-    collection.chefs.size.must_equal 1
     collection.distros.size.must_equal 1
     collection.layouts.size.must_equal 1
     collection.networks.size.must_equal 2

data/specs/collections_spec.rb

@@ -17,10 +17,6 @@ describe "Stork::Collections" do
     Stork::Collections.new.must_respond_to :networks
   end
 
-  it "responds to the chefs method" do
-    Stork::Collections.new.must_respond_to :chefs
-  end
-
   it "responds to the distros method" do
     Stork::Collections.new.must_respond_to :distros
   end

data/specs/kickstart_spec.rb

@@ -15,9 +15,8 @@ describe "Stork::Deploy::Kickstart" do
   %w{ RHEL5 RHEL6 RHEL7 }.each do |ver|
     it "should generate valid kickstart configurations for #{ver}" do
       ksvalidate  = "#{@path}/scripts/ksvalidate.sh"
-      testpath    = "#{@path}"
       kspath      = "#{@path}/tmp/output.ks"
-      template    = "#{@path}/stork/bundles/templates/default.ks.erb"
+      #template    = "#{@path}/stork/bundles/templates/default.ks.erb"
 
       ks = Stork::Deploy::InstallScript.new(@host, :kickstart)
 
@@ -25,7 +24,7 @@ describe "Stork::Deploy::Kickstart" do
         file.write(ks.render)
       end
 
-      Open3.popen3("#{ksvalidate} #{testpath} #{kspath} #{ver}") do |stdin, stdout, stderr, wait_thr|
+      Open3.popen3("#{ksvalidate} #{kspath} #{ver}") do |stdin, stdout, stderr, wait_thr|
         exit_status = wait_thr.value.to_i
         output = (stdout.readlines + stderr.readlines).join
         assert_equal(0, exit_status, output)

data/specs/resource_host_spec.rb

@@ -19,11 +19,6 @@ describe "Stork::Resource::Host" do
     Stork::Resource::Host.new.must_respond_to :template=
   end
 
-  it "must respond to the chef accessors" do
-    Stork::Resource::Host.new.must_respond_to :chef
-    Stork::Resource::Host.new.must_respond_to :chef=
-  end
-
   it "must respond to the pxemac accessors" do
     Stork::Resource::Host.new.must_respond_to :pxemac
     Stork::Resource::Host.new.must_respond_to :pxemac=
@@ -49,19 +44,19 @@ describe "Stork::Resource::Host" do
     Stork::Resource::Host.new.must_respond_to :distro=
   end
 
-  it "must respond to the run_list accessors" do
-    Stork::Resource::Host.new.must_respond_to :run_list
-    Stork::Resource::Host.new.must_respond_to :run_list=
+  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 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=
+  it "must respond to the tags accessors" do
+    Stork::Resource::Host.new.must_respond_to :tags
+    Stork::Resource::Host.new.must_respond_to :tags=
   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=
+  it "must respond to the environments accessors" do
+    Stork::Resource::Host.new.must_respond_to :environments
+    Stork::Resource::Host.new.must_respond_to :environments=
   end
 
   it "must return a hash with hashify" do
@@ -69,9 +64,7 @@ describe "Stork::Resource::Host" do
     hash = {   
       'name' => 'server.example.org', 
       'distro' => 'centos', 
-      'template' => 'default', 
-      'chef' => 'default',
-      'chef_environment' => 'testing',
+      'template' => 'default',
       'layout' => {
         'partitions' => [
           { 
@@ -125,19 +118,19 @@ describe "Stork::Resource::Host" do
       },
       'interfaces' => [
         { 
-          'ip' => '99.99.1.8',
+          'ip' => '192.168.0.15',
           'bootproto' => :static,
           'netmask' => '255.255.255.0',
-          'gateway' => nil,
-          'nameservers' => [],
-          'search_paths' => []
+          'gateway' => '192.168.0.1',
+          'nameservers' => ["192.168.0.2", "192.168.0.3"],
+          'search_paths' => ['example.org']
         },
         { 
           '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'],
+          'gateway' => nil,
+          'nameservers' => [],
           'search_paths' => []
         }
       ],
@@ -145,12 +138,9 @@ describe "Stork::Resource::Host" do
       'post_snippets' => [
         'ntp',
         'resolv-conf',
-        'chef-bootstrap',
-        'chef-reconfigure',
         'notify'
       ],
       'repos' => ['whamcloud-client'],
-      'run_list' => ['role[base]', 'recipe[apache]'], 
       'packages' => [
         '@core',
         'curl',
@@ -176,7 +166,9 @@ describe "Stork::Resource::Host" do
         'foo'
       ], 
       'timezone' => 'America/Los_Angeles', 
-      'selinux' => 'enforcing'
+      'selinux' => 'enforcing',
+      'tags' => [],
+      'environments' => []
     }
     host.hashify.must_equal hash
   end

data/specs/resource_interface_spec.rb

@@ -73,12 +73,33 @@ describe "Stork::Resource::Interface" do
   it "should raise a syntax error if the network is not found" do
     collection = Stork::Collections.new
     proc {
-      iface = Stork::Resource::Interface.build "eth0", collection: collection do
+      Stork::Resource::Interface.build "eth0", collection: collection do
         network 'invalid'
       end
     }.must_raise(SyntaxError)
   end
 
+  it "should error on invalid ip addresses" do
+    collection = Stork::Collections.new
+    proc {
+      Stork::Resource::Interface.build "eth0", collection: collection do
+        ip '1000.1000.1.1'
+      end
+    }.must_raise(SyntaxError)
+
+    proc {
+      Stork::Resource::Interface.build "eth0", collection: collection do
+        ip 'hey.there.buddy'
+      end
+    }.must_raise(SyntaxError)
+
+    proc {
+      Stork::Resource::Interface.build "eth0", collection: collection do
+        ip '1.1.1'
+      end
+    }.must_raise(SyntaxError)
+  end
+
   it "should have dhcp as the default for bootproto" do
     Stork::Resource::Interface.new('eth0').bootproto.must_equal :dhcp
   end

data/specs/resource_layout_spec.rb

@@ -26,7 +26,7 @@ describe "Stork::Resource::Layout" do
 
   it "requires a block for partition during build" do
     proc {
-      layout = Stork::Resource::Layout.build('test') do
+      Stork::Resource::Layout.build('test') do
         zerombr
         clearpart
         part '/'
@@ -36,7 +36,7 @@ describe "Stork::Resource::Layout" do
 
   it "requires a block for volume_group during build" do
     proc {
-      layout = Stork::Resource::Layout.build('test') do
+      Stork::Resource::Layout.build('test') do
         zerombr
         clearpart
         volgroup 'hello'
@@ -69,7 +69,7 @@ describe "Stork::Resource::Layout" do
 
   it "must error if part blocks are not given" do
     proc {
-      layout = Stork::Resource::Layout.build('test') do
+      Stork::Resource::Layout.build('test') do
         zerombr
         clearpart
       end

data/specs/resource_network_spec.rb

@@ -29,6 +29,62 @@ describe "Stork::Resource::Network" do
     Stork::Resource::Network.new("local").must_respond_to :search_paths=
   end
 
+  it "must error if the netmask given is invalid" do
+    proc {
+      Stork::Resource::Network.build "test" do
+        netmask '2555555.255.255.0'
+      end
+    }.must_raise(SyntaxError)
+
+    proc {
+      Stork::Resource::Network.build "test" do
+        netmask '255.255.255.foo'
+      end
+    }.must_raise(SyntaxError)
+
+    proc {
+      Stork::Resource::Network.build "test" do
+        netmask 'howdy.there.pilgrim'
+      end
+    }.must_raise(SyntaxError)
+  end
+
+  it "must error if the gateway is invalid" do
+    proc {
+      Stork::Resource::Network.build "test" do
+        gateway '10.1.1.1111'
+      end
+    }.must_raise(SyntaxError)
+
+    proc {
+      Stork::Resource::Network.build "test" do
+        gateway '10.1.1.blah'
+      end
+    }.must_raise(SyntaxError)
+
+    proc {
+      Stork::Resource::Network.build "test" do
+        gateway 'wow, this is a really cool gateway'
+      end
+    }.must_raise(SyntaxError)
+  end
+
+  it "must error if the nameserver are invalid" do
+    proc {
+      Stork::Resource::Network.build "test" do
+        nameserver 'superfly'
+        nameserver '8.8.8.8'
+      end
+    }.must_raise(SyntaxError)
+
+    proc {
+      Stork::Resource::Network.build "test" do
+        nameserver '8.8.8.8'
+        nameserver 'superfly'
+      end
+    }.must_raise(SyntaxError)
+  end
+
   it "should build" do
     net = Stork::Resource::Network.build("local") do
       netmask "255.255.255.0"

data/specs/scripts/kssetup.sh

@@ -1,24 +1,16 @@
 #!/usr/bin/env bash
+echo "Creating virtual environment: ksvalidator"
+virtualenv specs/ksvalidator
+echo "Activating!!!"
+. ./specs/ksvalidator/bin/activate
+echo "Installing packages"
+pip install -r ./specs/scripts/requirements.txt
 
-echo "Starting setup"
-if [ "$TRAVIS" = "true" ] ; then
-  sudo ip install pycurl
-  sudo pip install urlgrabber
-  git clone git://git.fedorahosted.org/git/pykickstart.git
-  cd pykickstart
-  sudo python setup.py install
-else
-  # pip install virtualenv
-  echo "Creating virtual environment: ksvalidator"
-  virtualenv ksvalidator
-  cd ksvalidator
-  echo "Activating!!!"
-  . ./bin/activate
-  echo "Installing packages"
-  pip install pycurl
-  pip install urlgrabber
-  git clone git://git.fedorahosted.org/git/pykickstart.git
-  cd pykickstart
-  python setup.py install
-fi
+cd ./specs/ksvalidator
+git clone https://github.com/rhinstaller/pykickstart
+cd pykickstart
+python setup.py install
+
+which ksvalidator
+env
 echo "Setup complete"

data/specs/scripts/ksvalidate.sh

@@ -1,21 +1,16 @@
 #!/usr/bin/env bash
 
-TESTPATH=$1
-KSPATH=$2
-VER=$3
-mkdir -p $TESTPATH
-cd $TESTPATH
+KSPATH=$1
+VER=$2
 
-if [ "$TRAVIS" != "true" ] ; then
-  if ! [ -f "./ksvalidator/bin/activate" ] ; then
-    echo "Please run 'rake ksvalidator:setup' to ensure that the virtual"
-    echo "environment is set up before running the integration tests or set"
-    echo "NOVALIDATE before you run"
-    exit 1
-  fi
-  cd ksvalidator
-  source bin/activate
+if ! [ -f "./specs/ksvalidator/bin/activate" ] ; then
+	echo "Please run 'rake ksvalidator:setup' to ensure that the virtual"
+	echo "environment is set up before running the integration tests or set"
+	echo "NOVALIDATE before you run"
+	exit 1
 fi
 
+source ./specs/ksvalidator/bin/activate
+
 ksvalidator -e -v $VER $KSPATH
 exit $?

data/specs/scripts/requirements.txt

@@ -0,0 +1,8 @@
+appdirs==1.4.3
+ordered-set==2.0.2
+packaging==16.8
+pycurl==7.43.0
+pyparsing==2.2.0
+requests==2.13.0
+six==1.10.0
+urlgrabber==3.10.2

data/specs/server_spec.rb

@@ -36,13 +36,13 @@ describe "Stork::Server::Application" do
   it "should output the kickstart file for a valid host" do
     get '/host/server.example.org/install'
     get '/host/server.example.org'
-    message = "foo"
+    # message = "foo"
     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"
+    # message = "foo"
     last_response.body.must_equal "{ \"status\":\"404\", \"message\": \"Not found\" }"
   end
 

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

@@ -1,7 +1,6 @@
 # Config for example.org
 host "server.example.org" do
   template    "default"
-  chef        "default"
   pxemac      "00:11:22:33:44:55"
   layout      "home"
   distro      "centos"
@@ -11,28 +10,20 @@ host "server.example.org" do
 
   interface "eth0" do
     bootproto :static
-    ip        "99.99.1.8"
-    # network   "org"
+    ip        "192.168.0.15"
+    network   "internal-one"
   end
 
   interface "eth1" 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"
+    network   "internal-two"
   end
 
   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] }
-  chef_environment "testing"
 end
 
 hosts=[
@@ -51,7 +42,6 @@ hosts=[
 hosts.each do |octet, mac|
   host "c0#{octet}.example.org" do
     template    "default"
-    chef        "default"
     distro      "centos"
     pxemac      mac
     layout      "home"
@@ -59,9 +49,8 @@ hosts.each do |octet, mac|
 
     interface "eth0" do
       bootproto :static
-      ip        "192.168.10.#{octet}"
-      network   "org"
+      ip        "192.168.0.#{octet}"
+      network   "internal-one"
     end
-    run_list %w{ role[node] }
   end
 end

data/specs/stork/bundles/networks/internal-one.rb

@@ -0,0 +1,7 @@
+network "internal-one" do
+  netmask "255.255.255.0"
+  gateway "192.168.0.1"
+  nameserver "192.168.0.2"
+  nameserver "192.168.0.3"
+  search_path "example.org"
+end

data/specs/stork/bundles/networks/internal-two.rb

@@ -0,0 +1,3 @@
+network "internal-two" do
+  netmask "255.255.255.0"
+end