oscar 0.2.0alpha5 → 0.3.0

data/CHANGELOG

@@ -1,12 +1,9 @@
 CHANGELOG
 =========
 
-0.2.0alpha1
------------
+0.3.0
+-----
 
-  * vagrant-hosts has been split out into an independent gem
-  * Added Gemfile, gemspec.
-  * Cleanup around validating and extracting the PE installer tarball
-  * Add support for autogenerated answers files.
-  * Perform the GRAND RENAMING from SoupKitchen to Oscar. It's the last
-    rename, I promise.
+2013-08-18
+
+First stable release of Oscar. All other releases are lies and deceit.

data/lib/oscar.rb

@@ -1,17 +1,17 @@
-
 module Oscar
+  require 'oscar/version'
+  require 'oscar/plugin'
 
-  def self.load!(directory)
-    env = Oscar::Environment.new
-    env.config.load! directory
-    env.run!
+  def self.source_root
+    @source_root ||= File.expand_path('..', __FILE__)
+  end
 
-    env
+  def self.template_root
+    @template_root ||= File.expand_path('../templates', source_root)
   end
+
+  require 'oscar/runner'
+  extend Oscar::Runner
 end
 
-require 'oscar/version'
-require 'oscar/config'
-require 'oscar/environment'
-require 'oscar/networking'
-require 'oscar/node'
+I18n.load_path << File.join(Oscar.template_root, 'locales/en.yml')

data/lib/oscar/command.rb

@@ -0,0 +1,38 @@
+require 'vagrant'
+module Oscar
+  class Command < Vagrant.plugin('2', :command)
+
+    require 'oscar/command/helpers'
+    include Oscar::Command::Helpers
+
+    require 'oscar/command/init'
+    require 'oscar/command/init_vms'
+
+    def initialize(argv, env)
+      @argv     = argv
+      @env      = env
+      @cmd_name = 'oscar'
+
+      split_argv
+      register_subcommands
+    end
+
+    def execute
+      invoke_subcommand
+    end
+
+    private
+
+    def register_subcommands
+      @subcommands = Vagrant::Registry.new
+
+      @subcommands.register('init') do
+        Oscar::Command::Init
+      end
+
+      @subcommands.register('init-vms') do
+        Oscar::Command::InitVMs
+      end
+    end
+  end
+end

data/lib/oscar/command/helpers.rb

@@ -0,0 +1,35 @@
+module Oscar::Command::Helpers
+
+  private
+
+  def split_argv
+    @main_args, @subcommand, @sub_args = split_main_and_subcommand(@argv)
+  end
+
+  def invoke_subcommand
+    if @subcommand and (klass = @subcommands.get(@subcommand))
+      klass.new(@argv, @env).execute
+    elsif @subcommand
+      @env.ui.error "Unrecognized subcommand: #{@subcommand}"
+      print_subcommand_help(:error)
+    else
+      print_subcommand_help
+    end
+  end
+
+  def print_subcommand_help(output = :info)
+    msg = []
+    msg << "Usage: vagrant #{@cmd_name} <command> [<args>]"
+    msg << ''
+    msg << 'Available subcommands:'
+
+    keys = []
+    @subcommands.each { |(key, _)| keys << key }
+    msg += keys.sort.map { |key| "     #{key}" }
+
+    msg << ''
+    msg << "For help on any individual command run `vagrant #{@cmd_name} <command> -h`"
+
+    @env.ui.send(output, msg.join("\n"))
+  end
+end

data/lib/oscar/command/init.rb

@@ -0,0 +1,38 @@
+require 'oscar/skeleton'
+
+class Oscar::Command::Init < Vagrant.plugin('2', :command)
+
+  include Oscar::Command::Helpers
+
+  def initialize(argv, env)
+    @argv     = argv
+    @env      = env
+    @cmd_name = 'oscar init'
+
+    @provider = nil
+
+    split_argv
+  end
+
+  def execute
+    argv = parse_options(parser)
+
+    skeleton = Oscar::Skeleton.new(@env, @provider)
+    skeleton.generate
+
+    @env.ui.info I18n.t('oscar.command.init.default')
+  end
+
+  private
+
+  def parser
+    OptionParser.new do |o|
+      o.banner = "Usage: vagrant #{@cmd_name} [<args>]"
+      o.separator ''
+
+      o.on('-p', '--provider=val', String, 'The Vagrant provider type to template') do |val|
+        @provider = val
+      end
+    end
+  end
+end

data/lib/oscar/command/init_vms.rb

@@ -0,0 +1,91 @@
+require 'yaml'
+
+class Oscar::Command::InitVMs < Vagrant.plugin('2', :command)
+
+  include Oscar::Command::Helpers
+
+  def initialize(argv, env)
+    @argv     = argv
+    @env      = env
+    @cmd_name = 'oscar init-vms'
+
+
+    @masters = []
+    @agents  = []
+    @pe_version = '3.0.0' # @todo remove thingy
+
+    split_argv
+  end
+
+  def execute
+    argv = parse_options(parser)
+
+    config_dir = Pathname.new(File.join(Dir.getwd, 'config'))
+
+    vm_config_file = config_dir + 'vms.yaml'
+    pe_config_file = config_dir + 'pe_build.yaml'
+
+    config_dir.mkpath unless config_dir.exist?
+
+    vm_config_file.open('w') do |fh|
+      yaml = YAML.dump vms
+      fh.write(yaml)
+    end
+
+    pe_config_file.open('w') do |fh|
+      yaml = YAML.dump pe_build
+      fh.write(yaml)
+    end
+  end
+
+  private
+
+  def parser
+    OptionParser.new do |o|
+      o.banner = "Usage: vagrant #{@cmd_name} [<args>]"
+      o.separator ''
+
+      o.on('-m', '--master=val', String, 'The name and basebox for a Puppet master') do |val|
+        name, box = val.split('=')
+        @masters << [name, box]
+      end
+
+      o.on('-a', '--agent=val', String, 'The name and basebox for a Puppet agent') do |val|
+        name, box = val.split('=')
+        @agents << [name, box]
+      end
+
+      o.on('-p', '--pe-version=val', String, 'The PE version to install on the VMs') do |val|
+        @pe_version = val
+      end
+    end
+  end
+
+  def vms
+    vm_list = []
+
+
+
+    vm_list += @masters.map do |(name, box)|
+      {
+        'name'  => name,
+        'box'   => box,
+        'roles' => ['pe-puppet-master']
+      }
+    end
+
+    vm_list += @agents.map do |(name, box)|
+      {
+        'name'  => name,
+        'box'   => box,
+        'roles' => ['pe-puppet-agent']
+      }
+    end
+
+    {'vms' => vm_list}
+  end
+
+  def pe_build
+    {'pe_build' => {'version' => @pe_version}}
+  end
+end

data/lib/oscar/plugin.rb

@@ -0,0 +1,12 @@
+require 'vagrant'
+
+module Oscar
+  class Plugin < Vagrant.plugin('2')
+    name 'oscar'
+
+    command(:oscar) do
+      require_relative 'command'
+      Oscar::Command
+    end
+  end
+end

data/lib/oscar/runner.rb

@@ -0,0 +1,13 @@
+
+module Oscar
+  module Runner
+    def run(config_dir)
+      require 'vagrant-hosts'
+      require 'vagrant-pe_build'
+      require 'vagrant-auto_network'
+      require 'vagrant-config_builder'
+
+      ConfigBuilder.load(:yaml, :yamldir, config_dir)
+    end
+  end
+end

data/lib/oscar/skeleton.rb

@@ -0,0 +1,32 @@
+require 'fileutils'
+
+module Oscar
+  class Skeleton
+
+    # @!attribute [r] provider
+    #   @return [Symbol] The provider for the generated configuration
+    attr_reader :provider
+
+    # @!attribute [r]
+    #   @return [Pathname] The path to the destination directory
+    attr_reader :dest_dir
+
+    # @param env      [Vagrant::Environment]
+    # @param provider [Symbol]
+    def initialize(env, provider = nil)
+      @env      = env
+      @provider = (provider || @env.default_provider)
+      @dest_dir = Pathname.new(Dir.getwd)
+
+      @template_root = File.join(Oscar.template_root, 'oscar-init-skeleton')
+    end
+
+    def generate
+      vagrantfile = File.join(@template_root, 'Vagrantfile')
+      config_dir  = File.join(@template_root, @provider.to_s, '.')
+
+      FileUtils.cp   vagrantfile, @dest_dir
+      FileUtils.cp_r config_dir,  File.join(@dest_dir, 'config')
+    end
+  end
+end

data/lib/oscar/version.rb

@@ -1,3 +1,3 @@
 module Oscar
-  VERSION = '0.2.0alpha5'
+  VERSION = '0.3.0'
 end

data/oscar.gemspec

@@ -17,11 +17,10 @@ Gem::Specification.new do |gem|
   gem.email    = 'adrien@somethingsinistral.net'
   gem.homepage = 'https://github.com/adrienthebo/oscar'
 
-  gem.add_dependency 'vagrant',          '~> 1.0.0'
-  gem.add_dependency 'vagrant-hosts',    '~> 0.0.1'
-  gem.add_dependency 'vagrant-pe_build', '>= 0.0.1'
-  gem.add_dependency 'kwalify',          '~> 0.7.0'
-  gem.add_dependency 'ipaddress',        '~> 0.8.0'
+  gem.add_dependency 'vagrant-hosts',          '>= 1.1.2'
+  gem.add_dependency 'vagrant-pe_build',       '>= 0.3.0'
+  gem.add_dependency 'vagrant-auto_network',   '>= 0.2.0'
+  gem.add_dependency 'vagrant-config_builder', '>= 0.1.0'
 
   gem.files        = %x{git ls-files -z}.split("\0")
   gem.require_path = 'lib'

data/templates/locales/en.yml

@@ -0,0 +1,9 @@
+---
+en:
+  oscar:
+    command:
+      init:
+        default: |-
+          A stub Vagrantfile has been placed in this directory and default configurations
+          have been placed into the `config` directory. You can now run `vagrant up` to start
+          your Oscar built environment, courtesy of Vagrant.

data/templates/oscar-init-skeleton/Vagrantfile

@@ -0,0 +1,4 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant.configure('2', &Oscar.run(File.expand_path('../config', __FILE__)))

data/templates/oscar-init-skeleton/virtualbox/boxes.yaml

@@ -0,0 +1,12 @@
+---
+# Boxes from http://puppet-vagrant-boxes.puppetlabs.com/
+# Updated: 2013-08-08
+boxes:
+  'fedora-18-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box'
+  'centos-64-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box'
+  'centos-59-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box'
+  'debian-607-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box'
+  'debian-70rc1-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box'
+  'sles-11sp1-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box'
+  'ubuntu-server-10044-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box'
+  'ubuntu-server-12042-x64-vbox4210-nocm': 'http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box'

data/templates/oscar-init-skeleton/virtualbox/roles.yaml

@@ -0,0 +1,19 @@
+---
+roles:
+  pe-puppet-master:
+    private_networks:
+      - {auto_network: true}
+    provider:
+      type: virtualbox
+      customize:
+        - [modifyvm, !ruby/sym id, '--memory', 1024]
+    provisioners:
+      - {type: hosts}
+      - {type: pe_bootstrap, role: !ruby/sym master}
+
+  pe-puppet-agent:
+    private_networks:
+      - {auto_network: true}
+    provisioners:
+      - {type: hosts}
+      - {type: pe_bootstrap}

metadata

@@ -1,48 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: oscar
 version: !ruby/object:Gem::Version
-  version: 0.2.0alpha5
-  prerelease: 5
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2013-08-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: vagrant-hosts
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: vagrant-pe_build
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,39 +42,39 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: kwalify
+  name: vagrant-auto_network
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: ipaddress
+  name: vagrant-config_builder
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.1.0
 description: ! "    Oscar is a series of extensions to simplify building out a Puppet
   Enterprise\n    environment. It handles networking configuration and fetching/installing\n
   \   Puppet Enterprise.\n"
@@ -105,16 +89,20 @@ files:
 - LICENSE
 - README.markdown
 - config/.gitignore
-- config/roles.yaml.dist
 - lib/oscar.rb
-- lib/oscar/config.rb
-- lib/oscar/environment.rb
-- lib/oscar/networking.rb
-- lib/oscar/node.rb
-- lib/oscar/schema.yaml
+- lib/oscar/command.rb
+- lib/oscar/command/helpers.rb
+- lib/oscar/command/init.rb
+- lib/oscar/command/init_vms.rb
+- lib/oscar/plugin.rb
+- lib/oscar/runner.rb
+- lib/oscar/skeleton.rb
 - lib/oscar/version.rb
-- lib/vagrant_init.rb
 - oscar.gemspec
+- templates/locales/en.yml
+- templates/oscar-init-skeleton/Vagrantfile
+- templates/oscar-init-skeleton/virtualbox/boxes.yaml
+- templates/oscar-init-skeleton/virtualbox/roles.yaml
 homepage: https://github.com/adrienthebo/oscar
 licenses: []
 post_install_message: 
@@ -130,9 +118,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -140,3 +128,4 @@ signing_key:
 specification_version: 3
 summary: Easy mode Puppet Enterprise provisioning
 test_files: []
+has_rdoc: 

data/lib/oscar/config.rb

@@ -1,99 +0,0 @@
-require 'oscar'
-require 'yaml'
-require 'kwalify'
-
-class Oscar::Config
-
-  attr_reader :data
-
-  def initialize
-    @data = {}
-
-    schema_path = File.expand_path(File.join(File.dirname(__FILE__), 'schema.yaml'))
-    schema      = YAML.load_file schema_path
-    validator   = Kwalify::Validator.new(schema)
-    @parser     = Kwalify::Yaml::Parser.new(validator)
-  end
-
-  def load!(searchpath)
-    files = ['config.yaml', 'config'].map { |m| "#{searchpath}/#{m}" }
-    load_all files
-
-    raise "No configuration loaded" if @data.nil? or @data.empty?
-  end
-
-  # Recursively load any YAML files contained in the given paths.
-  def load_all(*paths)
-    paths.flatten.each do |path|
-      if File.file?(path) and path.match /\.yaml$/
-        load_file(path)
-      elsif File.directory? path
-        load_all Dir["#{path}/*"]
-      #else
-      #  warn "#{path} is neither a YAML file nor a directory, ignoring it."
-      end
-    end
-  end
-
-  # Load YAML from a file and merge it into the aggregated YAML
-  #
-  # @raise [TypeError] If the YAML in a given file does not match the configuration schema
-  def load_file(filename)
-    localdata = @parser.parse_file(filename)
-    errors    = @parser.errors
-
-    if (errors and not errors.empty?)
-      errors.each do |err|
-        puts "#{filename} line #{err.linenum}, column #{err.column}, [kwalify path #{err.path}] #{err.message}"
-      end
-      raise TypeError
-    else
-      @data.merge!(localdata)
-    end
-  end
-
-  # Collects all node configuration as an array of the node structured data.
-  #
-  # @return [Array<Hash<String, String>>]
-  def all_node_configs
-    names = @data["nodes"].map { |h| h['name'] }
-    names.map { |n| node_config(n) }
-  end
-
-  # Provides the structured data representation of a node.
-  #
-  # Configuration priority is 'profile' -> 'role' -> 'node'
-  #
-  # @param [String] name The name of the node to fetch
-  #
-  # @return [Hash<String, String>]
-  def node_config(node_name)
-    config = {}
-
-    unless (node_hash = @data['nodes'].find { |h| h['name'] == node_name })
-      raise "Node configuration for #{node_name} not found"
-    end
-
-    # Check to see if the node has a profile or role. If one of those values
-    # do exist, try to lookup that data and merge it into the config hash.
-    ['profile', 'role'].each do |type|
-      plural_type = "#{type}s"
-
-      type_name = node_hash[type] # Check to see if we have the requested type
-      if (type_name and type_hash = @data[plural_type].find { |t| t['name'] == type_name })
-        # The requested type exists in the node hash, and we were able to lookup
-        # the related configuration.
-        config.merge! type_hash
-      else
-        # The requested type exists in the node hash, but we were not able to
-        # lookup the related configuraion; die messily.
-        raise %{#{type.capitalize} configuration "#{type}" for #{node_name} not found}
-      end
-    end
-
-    # Merge the node hash last so that it takes precedence
-    config.merge! node_hash
-
-    config
-  end
-end

data/lib/oscar/environment.rb

@@ -1,28 +0,0 @@
-require 'oscar'
-
-class Oscar::Environment
-  attr_reader :networking
-  attr_reader :config
-
-  def initialize
-    @config     = Oscar::Config.new
-    @nodes = []
-  end
-
-  def run!
-    @networking = Oscar::Networking.new(@config.data["networking"])
-    nodes       = @config.all_node_configs
-
-    # TODO make sure that the master is provisioned before any agents.
-    nodes.each do |node_attrs|
-      node = Oscar::Node.new(node_attrs)
-      @networking.register(node)
-
-      @nodes << node
-    end
-
-    Vagrant::Config.run do |config|
-      @nodes.each { |node| node.define(config) }
-    end
-  end
-end

data/lib/oscar/networking.rb

@@ -1,39 +0,0 @@
-require 'oscar'
-require 'ipaddress'
-
-class Oscar::Networking
-
-  def initialize(yaml_config)
-
-    range       = yaml_config["pool"]
-    @domainname = yaml_config["domainname"]
-    @network = IPAddress.parse(range)
-
-    @pool  = []
-    @nodes = {}
-
-    @network.each_host { |h| @pool << h }
-    @iterator = @pool.each
-
-  end
-
-  def register(node)
-    next_addr = @iterator.next.to_s
-
-    node.networking = self
-    node.address    = next_addr
-
-    @nodes[next_addr] = node
-  end
-
-  def hosts_for(node)
-    arr = []
-
-    arr << ['127.0.0.1', ['localhost']]
-    arr << ['127.0.1.1', ["#{node.name}.#{@domainname}", node.name]]
-
-    @nodes.each_pair { |address, n| arr << [address, [n.name, "#{n.name}.#{@domainname}"]] }
-
-    arr
-  end
-end

data/lib/oscar/node.rb

@@ -1,89 +0,0 @@
-require 'oscar'
-require 'vagrant'
-
-require 'vagrant-hosts'
-
-class Oscar::Node
-
-  class << self
-    def addrole(name, &block)
-      @roles ||= {}
-      @roles[name] = block
-    end
-
-    def getrole(name)
-      @roles[name] if @roles
-    end
-  end
-
-  addrole(:base) do |node|
-    node.vm.box = @boxname
-
-    if @forwards
-      @forwards.each { |h| node.vm.forward_port h["source"], h["dest"] }
-    end
-
-    node.vm.network :hostonly, @address
-    # Add in optional per-node configuration
-    node.vm.box_url          = @boxurl if @boxurl
-    node.vm.boot_mode        = @gui    if @gui
-
-    host_entries = @networking.hosts_for(self)
-
-    node.vm.provision :hosts do |provisioner|
-      host_entries.each { |(address, aliases)| provisioner.add_host address, aliases }
-      provisioner.add_ipv6_multicast
-    end
-
-    node.vm.provision :puppet_enterprise_bootstrap do |pe|
-      pe.role = @role if @role
-    end
-  end
-
-  addrole(:master) do |node|
-    # Manifests and modules need to be mounted on the master via shared folders,
-    # but the default /vagrant mount has permissions and ownership that conflicts
-    # with the master and pe-puppet. We mount these folders separately with
-    # loosened permissions.
-    node.vm.share_folder 'manifests', '/manifests', './manifests', :extra => 'fmode=644,dmode=755,fmask=022,dmask=022'
-    node.vm.share_folder 'modules',   '/modules',   './modules',   :extra => 'fmode=644,dmode=755,fmask=022,dmask=022'
-
-    # Boost RAM for the master so that activemq doesn't asplode
-    node.vm.customize([ "modifyvm", :id, "--memory", "1024" ])
-  end
-
-  attr_accessor :address
-  attr_writer :networking # Callback attribute for retrieving hosts
-
-  attr_reader :name, :boxname, :boxurl, :role
-  attr_reader :forwards # really?
-
-  def initialize(yaml_attrs)
-    @attrs = yaml_attrs
-
-    @name    = @attrs["name"]
-    @address = @attrs["address"]
-    @role    = @attrs["role"].intern if @attrs["role"]
-
-    @boxurl   = @attrs["boxurl"]
-    @boxname  = @attrs["boxname"]
-    @forwards = @attrs["forwards"]
-    @gui      = @attrs["gui"]
-  end
-
-  def define(config)
-
-    blk = lambda do |config|
-      config.vm.define @name do |node|
-
-        instance_exec(node, &(self.class.getrole(:base)))
-
-        if (blk = self.class.getrole(@role))
-          instance_exec(node, &blk)
-        end
-      end
-    end
-
-    blk.call(config)
-  end
-end

data/lib/oscar/schema.yaml

@@ -1,73 +0,0 @@
----
-# Oscar kwalify schema
-
-type: map
-mapping:
-
-  "nodes":
-    type: seq
-    sequence:
-      -
-        type: map
-        mapping:
-          "name": { required: true }
-          "address": { required: false }
-
-          "boxname": &boxname
-            type: str
-          "boxurl": &boxurl
-            type: str
-          "role":
-            desc: "A node can have a role, that adds specific configuration for how it is going to be used."
-            type: str
-            enum: ["master", "console", "agent"]
-            default: "agent"
-
-          "profile":
-            desc: "A node can have a profile, which describes where the box came from."
-            type: str
-          "forwards": &forwards
-            type: seq
-            sequence:
-              -
-                type: map
-                mapping:
-                  "source":
-                    type: int
-                    required: true
-                  "dest":
-                    type: int
-                    required: true
-
-  "profiles":
-    desc: "A profile describes a box type, so what name it is and where to retrieve it from."
-    type: seq
-    sequence:
-      -
-        type: map
-        mapping:
-          "name":
-            required: true
-          "boxname": *boxname
-          "boxurl": *boxurl
-
-
-  "roles":
-    desc: "A role is the configuration needed for a node to do a specific role."
-    type: seq
-    sequence:
-      -
-        type: map
-        mapping:
-          name: { required: true }
-          "forwards": *forwards
-
-  # Network configuration for oscar, not applicable to any node.
-  "networking":
-    type: map
-    mapping:
-      "pool":
-        required: true
-      "domainname":
-        required: true
-

data/lib/vagrant_init.rb

@@ -1,2 +0,0 @@
-require 'oscar'
-require 'pe_build'