oscar 0.3.0 → 0.3.1

data/CHANGELOG

@@ -1,6 +1,17 @@
 CHANGELOG
 =========
 
+0.3.1
+-----
+
+2013-09-11
+
+This is a backwards compatible bugfix release.
+
+  * Improvements to command line interface, messages, and help options
+  * Updated README to be vaguely helpful
+  * Update 'roles' template to behave with auto_network and vagrant 1.2.7+
+
 0.3.0
 -----
 

data/README.markdown

@@ -1,10 +1,119 @@
 Oscar
 =====
 
-Oscar helps you build a full Puppet Enterprise environment from vagrant base boxes.
+Oscar is a set of Vagrant plugins and templates that build up a full Puppet
+Enterprise environment based on top of Vagrant.
+
+Synopsis
+--------
+
+Initialize the base Oscar environment:
+
+    └> vagrant oscar init
+    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.
+
+Define a set of VMs:
+
+    └> vagrant oscar init-vms \
+      --master master=centos-64-x64-vbox4210-nocm \
+      --agent first=centos-59-x64-vbox4210-nocm   \
+      --agent second=ubuntu-server-10044-x64-vbox4210-nocm
+    Your environment has been initialized with the following configuration:
+    masters:
+      - ["master", "centos-64-x64-vbox4210-nocm"]
+    agents:
+      - ["first", "centos-59-x64-vbox4210-nocm"]
+      - ["second", "ubuntu-server-10044-x64-vbox4210-nocm"]
+    pe_version: 3.0.1
+
+And build everything:
+
+    └> vagrant up
+    Bringing machine 'master' up with 'virtualbox' provider...
+    Bringing machine 'first' up with 'virtualbox' provider...
+    Bringing machine 'second' up with 'virtualbox' provider...
+    [... normal `vagrant up` goes here ...]
+
+Commands
+--------
+
+Oscar provides a set commands to generate a working environment from templates.
+
+### `vagrant oscar init`
+
+This command initializes the current working directory with a stub Vagrantfile
+that loads Oscar, and generates generic configuration information for use with
+PE.
+
+### `vagrant oscar init-vms`
+
+This command generates a set of guest machines inside of the vagrant
+environment.
+
+Configuring
+-----------
+
+Oscar handles guest machine configuration with YAML.
+
+The default configuration looks something like this:
+
+### `config/boxes.yaml`
+
+    ---
+    # 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'
+    [...]
+
+### `config/roles.yaml`
+
+    ---
+    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}
+    [...]
+
+### `config/pe_build.yaml`
+
+    ---
+    pe_build:
+      version: 3.0.0
+
+### `config/vms.yaml`
+
+    ---
+    vms:
+    - name: master
+      box: centos-6-i386
+      roles:
+      - pe-puppet-master
+    - name: agent
+      box: debian-6-i386
+      roles:
+      - pe-puppet-agent
+
+Oscar uses `vagrant-config_builder` to handle guest machine configuration.
 
 Installation
 ------------
 
-    gem install --pre oscar
-    # magic!
+    $ vagrant plugin install oscar
+
+Requirements
+------------
+
+The plugins used in Oscar require the Vagrant 1.1 plugin API, so Vagrant 1.1+ is
+required.

data/lib/oscar/command/init.rb

@@ -33,6 +33,11 @@ class Oscar::Command::Init < Vagrant.plugin('2', :command)
       o.on('-p', '--provider=val', String, 'The Vagrant provider type to template') do |val|
         @provider = val
       end
+
+      o.on('-h', '--help', 'Display this help message') do
+        puts o
+        exit 0
+      end
     end
   end
 end

data/lib/oscar/command/init_vms.rb

@@ -12,7 +12,9 @@ class Oscar::Command::InitVMs < Vagrant.plugin('2', :command)
 
     @masters = []
     @agents  = []
-    @pe_version = '3.0.0' # @todo remove thingy
+
+    require 'pe_build/release'
+    @pe_version = PEBuild::Release::LATEST_VERSION
 
     split_argv
   end
@@ -20,22 +22,16 @@ class Oscar::Command::InitVMs < Vagrant.plugin('2', :command)
   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?
+    write_configs
 
-    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
+    @env.ui.info(
+      I18n.t(
+        'oscar.command.init_vms.settings',
+        :masters => @masters.map { |m| "  - #{m}" }.join("\n"),
+        :agents  => @agents.map { |m| "  - #{m}" }.join("\n"),
+        :pe_version => @pe_version,
+      )
+    )
   end
 
   private
@@ -58,24 +54,46 @@ class Oscar::Command::InitVMs < Vagrant.plugin('2', :command)
       o.on('-p', '--pe-version=val', String, 'The PE version to install on the VMs') do |val|
         @pe_version = val
       end
+
+      o.on('-h', '--help', 'Display this help message') do
+        puts o
+        exit 0
+      end
     end
   end
 
-  def vms
-    vm_list = []
+  def write_configs
+    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
+
+  def vms
+    vm_list = []
 
-    vm_list += @masters.map do |(name, box)|
-      {
+    @masters.each do |(name, box)|
+      vm_list << {
         'name'  => name,
         'box'   => box,
         'roles' => ['pe-puppet-master']
       }
     end
 
-    vm_list += @agents.map do |(name, box)|
-      {
+    @agents.each do |(name, box)|
+      vm_list << {
         'name'  => name,
         'box'   => box,
         'roles' => ['pe-puppet-agent']

data/lib/oscar/version.rb

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

data/oscar.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.homepage = 'https://github.com/adrienthebo/oscar'
 
   gem.add_dependency 'vagrant-hosts',          '>= 1.1.2'
-  gem.add_dependency 'vagrant-pe_build',       '>= 0.3.0'
+  gem.add_dependency 'vagrant-pe_build',       '>= 0.4.2'
   gem.add_dependency 'vagrant-auto_network',   '>= 0.2.0'
   gem.add_dependency 'vagrant-config_builder', '>= 0.1.0'
 

data/templates/locales/en.yml

@@ -7,3 +7,11 @@ en:
           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.
+      init_vms:
+        settings: |-
+          Your environment has been initialized with the following configuration:
+          masters:
+          %{masters}
+          agents:
+          %{agents}
+          pe_version: %{pe_version}

data/templates/oscar-init-skeleton/Vagrantfile

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

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

@@ -2,7 +2,7 @@
 roles:
   pe-puppet-master:
     private_networks:
-      - {auto_network: true}
+      - {ip: '0.0.0.0', auto_network: true}
     provider:
       type: virtualbox
       customize:
@@ -13,7 +13,7 @@ roles:
 
   pe-puppet-agent:
     private_networks:
-      - {auto_network: true}
+      - {ip: '0.0.0.0', auto_network: true}
     provisioners:
       - {type: hosts}
       - {type: pe_bootstrap}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oscar
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-hosts
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: vagrant-auto_network
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,6 @@ files:
 - Gemfile
 - LICENSE
 - README.markdown
-- config/.gitignore
 - lib/oscar.rb
 - lib/oscar/command.rb
 - lib/oscar/command/helpers.rb