seperate node specific data from role

Berksfile

@@ -2,7 +2,8 @@
 #^syntax detection
 site :opscode
 
-cookbook 'apt'
+cookbook "apt"
+cookbook "minitest-handler"
 
 def own_cookbook(name,opts={})
   opts = { path: "site-cookbooks/#{name}"}.merge!(opts)
@@ -12,3 +13,4 @@ end
 own_cookbook "dhcp"
 own_cookbook "bind"
 own_cookbook "ntp"
+own_cookbook "main"

Gemfile

@@ -5,6 +5,8 @@ gem "chef"#, '~> 0.10.6'
 gem "pry-nav"
 
 gem "chefspec"
+gem "minitest-chef-handler"
+gem "fauxhai"
 gem "rspec"
 gem 'knife-spec'
 gem "berkshelf"

Vagrantfile

@@ -4,9 +4,14 @@
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
+def load_json(name)
+  path = File.join(File.dirname(__FILE__), "nodes", name)
+  JSON.load(File.open(path))
+end
+
 boxes = [
-  { name: "head_node", ip: '172.28.128.2', role: :head_node },
-  #{ name: "compute_node",                  role: :compute_node, mac: "5CA1AB1E0001" }
+  { name: "node0.lctp", role: :head_node,    mac: "5CA1AB1E0001", json: load_json("node0.json") },
+  { name: "node1.lctp", role: :compute_node, mac: "5CA1AB1E0001", json: load_json("node1.json") }
 ]
 
 ["vbguest", "berkshelf"].each do |plugin|
@@ -30,23 +35,32 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   chef_default = proc do |chef|
     chef.cookbooks_path = "cookbooks"
-    chef.roles_path = "roles"
     chef.data_bags_path = "data_bags"
+    chef.roles_path     = "roles"
   end
 
   boxes.each do |box|
     config.vm.define box[:name] do |node|
-      if box[:ip]
-        node.vm.network :private_network, ip: box[:ip]
-      else
-        node.vm.network :private_network, type: :dhcp, mac: box[:mac]
+      node.vm.provider :virtualbox do |vb|
+        vb.gui = true
+        # 1. adapter: NAT to allow vagrant setup the machine
+        # 2. adapter: for internal network between nodes
+        vb.customize ["modifyvm", :id,
+                      "--nic1", "nat",
+                      "--nictype1", "virtio",
+                      "--nic2", "intnet",
+                      "--nictype2", "virtio",
+                      "--intnet2", "lctp",
+                      "--macaddress2", box[:mac]]
       end
 
+      node.vm.hostname = box[:name]
+
       config.vm.provision :chef_solo do |chef|
         chef_default.call(chef)
         chef.add_role box[:role].to_s
+        chef.json = box[:json]
       end
     end
   end
-
 end

nodes/node0.json

@@ -0,0 +1,41 @@
+{
+   "main": {
+     "head_node": {
+       "internal_ip": "172.28.128.1"
+     }
+   },
+   "dhcp" : {
+     "domain": {
+       "name": "lctp",
+       "server": "node0.lctp"
+     },
+     "interface": "eth1",
+     "subnet": {
+       "gateway": "node0.lctp",
+       "prefix": "172.28.128.0",
+       "netmask": "255.255.255.0"
+     },
+     "hosts": [{
+       "name": "node1",
+       "mac": "5c:a1:ab:1e:00:01",
+       "ip": "172.28.128.101"
+     }]
+   },
+   "ntp" : {
+     "subnets": ["::1", "127.0.0.1", "172.28.128.0/24"]
+   },
+   "bind": {
+     "zones" : {
+       "lctp": {
+         "records": [
+           { "name": "node0", "type": "A", "value": "172.28.128.1" },
+           { "name": "node1", "type": "A", "value": "172.28.128.101" }
+         ]
+       },
+       "128.28.172.in-addr.arpa": {
+         "records": [{ "name": "101", "type": "PTR", "value": "node1" }]
+       }
+     },
+     "trusted_subnets": ["localhost", "localnets", "172.28.128.0/24"]
+   }
+}

nodes/node1.json

@@ -0,0 +1 @@
+{}

roles/compute_node.json

@@ -4,12 +4,8 @@
   "json_class": "Chef::Role",
   "description": "Compute Node",
   "default_attributes": {
-    "ntp": {
-      "server": "de.pool.ntp.org"
-    }
   },
   "run_list": [
-    "recipe[apt]",
-    "recipe[ntp]"
+    "recipe[main::compute_node]"
   ]
 }

roles/head_node.json

@@ -4,32 +4,11 @@
   "json_class": "Chef::Role",
   "description": "Head Node",
   "default_attributes": {
-    "dhcp" : {
-      "hosts": [{
-        "name": "node0",
-        "mac": "5CA1AB1E0001",
-        "ip": "172.28.128.101"
-      }]
-    },
-    "ntp" : {
-      "subnets": ["::1", "127.0.0.1", "172.28.128.0/24"]
-    },
-    "bind": {
-      "zones" : {
-        "lctp": {
-          "records": [{ "name": "node1", "type": "A", "value": "172.28.128.101" }]
-        },
-        "128.28.172.in-addr.arpa": {
-          "records": [{ "name": "101", "type": "PTR", "value": "node1" }]
-        }
-      },
-      "trusted_subnets": ["localhost", "localnets", "172.28.128.101"]
+    "ntp": {
+      "server": "de.pool.ntp.org"
     }
   },
   "run_list": [
-    "recipe[apt]",
-    "recipe[dhcp]",
-    "recipe[ntp]",
-    "recipe[bind]"
+    "recipe[main::head_node]"
   ]
 }

site-cookbooks/bind/files/default/test/default_test.rb

@@ -0,0 +1,10 @@
+require 'minitest/spec'
+
+describe_recipe 'bind::default' do
+  it "starts the named daemon" do
+    assert_sh("service bind9 status")
+  end
+  it "should resolve dns" do
+    assert_sh("dig localhost @localhost")
+  end
+end

site-cookbooks/bind/templates/default/zone.erb

@@ -4,9 +4,7 @@
                         4H        ; retry
                         3W        ; expire
                         1D )      ; minimun
-                        NS <%= @node.hostname %>
-
-<%= @node.hostname %> A <%= @node.ipaddress %>
+                        NS <%= @node.fqdn %>.
 
 <% @zone.records.each do |record| -%>
 <%= record.name %> <%= record.type %> <%= record.value %>

site-cookbooks/dhcp/attributes/default.rb

@@ -1,3 +1,7 @@
-default.dhcp.domain.name = "lctp"
-default.dhcp.domain.server = "lctp"
-default.hosts = []
+default.dhcp.domain.name = "privat"
+default.dhcp.domain.server = "ns.privat"
+default.dhcp.hosts = []
+default.dhcp.interface = "eth0"
+default.dhcp.subnet.prefix = "192.168.2.0"
+default.dhcp.subnet.netmask = "255.255.255.0"
+default.dhcp.subnet.gateway = "192.168.2.1"

site-cookbooks/dhcp/files/default/test/default_test.rb

@@ -0,0 +1,10 @@
+require 'minitest/spec'
+
+describe_recipe 'dhcp::default' do
+  it "starts the named daemon" do
+    assert_sh("service isc-dhcp-server status")
+  end
+  it "should resolve dns" do
+    assert_sh("dig localhost @localhost")
+  end
+end

site-cookbooks/dhcp/recipes/default.rb

@@ -2,8 +2,24 @@ include_recipe "apt"
 
 package "isc-dhcp-server"
 
-template "/etc/dhcpcd.conf" do
+template "/etc/dhcp/dhcpd.conf" do
   owner "root"
   group "root"
+  mode "0664"
   source "dhcpd.conf.erb"
+  notifies :reload, "service[isc-dhcp-server]"
+end
+
+template "/etc/default/isc-dhcp-server" do
+  owner "root"
+  group "root"
+  mode "0664"
+  source "isc-dhcp-server.erb"
+  notifies :reload, "service[isc-dhcp-server]"
+end
+
+service "isc-dhcp-server" do
+  provider Chef::Provider::Service::Upstart
+  action [:enable, :start]
+  supports status: true, start: true, stop: true, restart: true
 end

site-cookbooks/dhcp/templates/default/dhcpd.conf.erb

@@ -1,15 +1,18 @@
-# Crontab for <%= @node.name %> managed by Chef. Changes will be overwritten.
+# dhcpd.conf for <%= @node.name %> managed by Chef. Changes will be overwritten.
 default-lease-time 600;
 max-lease-time 7200;
 # option definitions common to all supported networks...
 option domain-name <%= @node.dhcp.domain.name %>;
 option domain-name-servers <%= @node.dhcp.domain.server %>;
 
+subnet <%= @node.dhcp.subnet.prefix %> netmask <%= @node.dhcp.subnet.netmask%> {
+  option routers <%= @node.dhcp.subnet.gateway%>;
+}
+
 <% @node.dhcp.hosts.each do |host| -%>
-  host <%= host.name %> {
+host <%= host.name %> {
   hardware ethernet <%= host.mac %>;
   fixed-address <%= "#{host.name}.#{@node.dhcp.domain.name}" %>;
   use-host-decl-names true;
-    next-server <%= host.ip %>;
-  }
+}
 <% end -%>

site-cookbooks/dhcp/templates/default/isc-dhcp-server.erb

@@ -0,0 +1,2 @@
+# /etc/default/isc-dhcp-server for <%= @node.name %> managed by Chef. Changes will be overwritten.
+INTERFACES="<%= @node.dhcp.interface %>"

site-cookbooks/main/attributes/head_node.rb

@@ -0,0 +1,2 @@
+default.main.head_node.internal_ip = "192.168.2.1"
+default.main.head_node.internal_network_device = "eth1"

site-cookbooks/main/metadata.rb

@@ -0,0 +1,6 @@
+name "main"
+depends "apt"
+depends "ntp"
+depends "dhcp"
+depends "bind"
+depends "minitest-handler"

site-cookbooks/main/recipes/compute_node.rb

@@ -0,0 +1,3 @@
+include_recipe "minitest-handler"
+include_recipe "apt"
+include_recipe "ntp"

site-cookbooks/main/recipes/head_node.rb

@@ -0,0 +1,10 @@
+include_recipe "minitest-handler"
+include_recipe "apt"
+include_recipe "ntp"
+include_recipe "bind"
+
+ifconfig node.main.head_node.internal_ip do
+  device node.main.head_node.internal_network_device
+end
+
+include_recipe "dhcp"

spec/coobooks/dhcp_spec.rb

@@ -5,14 +5,14 @@ describe 'dhcp::default' do
     ChefSpec::Runner.new do |node|
       node.set["dhcp"]["hosts"] =[{
         name: "node0",
-        mac: "5CA1AB1E0001",
+        mac: "5c:a1:ab:1e:00:01",
         ip: "172.28.128.101"
       }]
     end.converge(described_recipe)
   end
 
   it "should setup dhcp" do
-    chef_run.should render_file("/etc/dhcpcd.conf").with_content("node0")
+    chef_run.should render_file("/etc/dhcp/dhcpd.conf").with_content("node0")
     chef_run.should install_package("isc-dhcp-server")
   end
 end

spec/coobooks/main_spec.rb

@@ -0,0 +1,30 @@
+require_relative '../spec_helper'
+
+describe 'main::head_node' do
+  let(:chef_run) do
+    ChefSpec::Runner.new do |node|
+      node.set["main"] = {
+        head_node: {
+          internal_ip: "10.10.1.1",
+          internal_network_device: "10.10.1.1"
+        }
+      }
+    end.converge(described_recipe)
+  end
+  it "should include cookbooks" do
+    expect(chef_run).should include_recipe('ntp')
+    expect(chef_run).should include_recipe('bind')
+    expect(chef_run).should include_recipe('dhcp')
+  end
+end
+
+describe 'main::compute_node' do
+  let(:chef_run) do
+    ChefSpec::Runner.new do |node|
+    end.converge(described_recipe)
+  end
+  it "should include cookbooks" do
+    expect(chef_run).should include_recipe('apt')
+    expect(chef_run).should include_recipe('ntp')
+  end
+end

spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'chefspec'
 require 'chefspec/berkshelf'
 require 'pry'
+require 'fauxhai'
 
 RSpec.configure do |config|
   config.color_enabled = true