vagrant-config_builder 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b242f323d273ed6a555d016d2281609563d28620
-  data.tar.gz: badb6da19a3ec43aea229f162ea616b5e04be7c5
+  metadata.gz: d978845f673cd4fd8fee29c4baa0976fba50b612
+  data.tar.gz: 16164ce3af929e4005c44b8725e9da99528799be
 SHA512:
-  metadata.gz: c78a02cc55ebf0fc674ca2cc3e0038350fd3ffacdd55bbaa659c18e88dcf008f630ba3e1bf9c8c48c07ef3e442383815edac8393582b6a44c34772b7210a940a
-  data.tar.gz: ab497c2f941c60880b6aafa1c586dda6d3f4acfe3a4c6f762d8f8506f7c3066223a9ff89786160796924fc692479b0b60cb701f285992304b2602cc453e7fc49
+  metadata.gz: 47df11d730c5af000107adf333349a41aa35c53f35d9b02eacea19a5a768e031f11fc636f0f25563e47000231d94fbed2bac7b59083f4b8b8acd9c1f805aefa7
+  data.tar.gz: ebb29afcc5e993b0ab1379f73c811bb86d82852caa2ae163ac49a2646cf9aa61a5d155e19a81be7636a538cd4106e52f522f6af495740174204f6cdbdee21bc2

data/CHANGELOG

@@ -1,6 +1,26 @@
 CHANGELOG
 =========
 
+0.12.0
+------
+
+2014-10-07
+
+This is a backwards feature release.
+
+  * (GH-22) Support for VMware Workstation providers.
+
+  * (GH-24) New YAML loader which pre-processes data using ERB to enable
+    dynamic interpolation of values.
+
+  * (GH-25) Support for VMware vSphere providers.
+
+  * (GH-28) Support for libvirt providers.
+
+  * Support for the file provisioner.
+
+Thanks to Nan Liu and Lukas Stanek for their contributions to this release.
+
 0.11.0
 ------
 

data/README.markdown

@@ -19,44 +19,88 @@ for clarity.
 
 #### Directory structure
 
-    .
-    ├── config
-    │   ├── roles.yaml
-    │   └── vms.yaml
-    └── Vagrantfile
+```shell
+.
+├── config
+│   ├── roles.yaml
+│   └── vms.yaml
+└── Vagrantfile
+```
 
 #### Vagrantfile
 
-    require 'config_builder'
-    Vagrant.configure('2', &ConfigBuilder.load(
-      :yaml,
-      :yamldir,
-      File.expand_path('../config', __FILE__)
-    ))
+For pure yaml configurations, use yaml loader:
+```ruby
+require 'config_builder'
+Vagrant.configure('2', &ConfigBuilder.load(
+  :yaml,
+  :yamldir,
+  File.expand_path('../config', __FILE__)
+))
+```
+
+For yaml erb configurations, use yaml_erb loader:
+```ruby
+require 'config_builder'
+Vagrant.configure('2', &ConfigBuilder.load(
+  :yaml_erb,
+  :yamldir,
+  File.expand_path('../config', __FILE__)
+))
+```
+
+The yaml_erb loader would allow configuration such as:
+```yaml
+---
+roles:
+  puppet_apply:
+    provisioners:
+      - type: puppet
+        manifests_path: 'tests'
+        module_path: 'spec/fixtures/modules'
+        manifest_file: <%= ENV['VAGRANT_MANIFEST'] || 'init.pp' %>
+```
 
 #### config/roles.yaml
 
-    ---
-    roles:
-      bigvm:
-        provider:
-          type: virtualbox
-          customize: [[modifyvm, !ruby/sym id, '--memory', 1024]]
+```yaml
+---
+boxes:
+  centos-65-x64: http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-puppet.box
+  debian-73-x64: http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box
+roles:
+  bigvm:
+    provider:
+      type: virtualbox
+      customize: [[modifyvm, !ruby/sym id, '--memory', 1024]]
+    synced_folders:
+      - host_path: '.'
+        guest_path: '/vagrant'
+        disabled: true
+  smallvm:
+    provider:
+      type: vmware
+      vmx:
+        memsize: 512
+        numvcpus: 1
+```
 
 #### config/vms.yaml
 
-    ---
-    vms:
-      -
-        name: db
-        private_networks: [ {ip: '10.20.1.2'} ]
-        box: centos-5-i386
-        hostname: db.puppetlabs.vm
-        roles: bigvm
-      -
-        name: web
-        private_networks: [ {ip: '10.20.1.3'} ]
-        box: centos-5-i386
+```yaml
+---
+vms:
+  -
+    name: db
+    private_networks: [ {ip: '10.20.1.2'} ]
+    box: centos-65-x64
+    hostname: db.puppetlabs.vm
+    roles: bigvm
+  -
+    name: web
+    private_networks: [ {ip: '10.20.1.3'} ]
+    box: debian-73-x64
+```
 
 Installation
 ------------

data/lib/config_builder/loader/yaml.rb

@@ -22,7 +22,7 @@ class ConfigBuilder::Loader::YAML
     rv = {}
 
     files.each do |file|
-      contents = ::YAML.load_file(file)
+      contents = yamlfile(file)
       if contents.is_a? Hash
         rv = DeepMerge::deep_merge!(contents, rv, {:preserve_unmergables => false})
       end

data/lib/config_builder/loader/yaml_erb.rb

@@ -0,0 +1,24 @@
+require 'erb'
+
+class ConfigBuilder::Loader::YAML_ERB < ConfigBuilder::Loader::YAML
+
+  # Load configuration from a YAML file with ERB interpolation first
+  #
+  # @param file_path [String]
+  #
+  # @example the following config file will be processed by ERB first so it can
+  # determine whether to use the environment variable 'VAGRANT_MANIFEST' or the
+  # default value 'init.pp' for the puppet manifest file.
+  #
+  # ---
+  #   provisioner:
+  #     - type: puppet
+  #       manifest_file: <%= ENV['VAGRANT_MANIFEST'] || 'init.pp' >
+  #
+  # @return [Hash]
+  def yamlfile(file_path)
+    ::YAML.load(::ERB.new(File.read(file_path)).result)
+  end
+
+  ConfigBuilder::Loader.register(:yaml_erb, self)
+end

data/lib/config_builder/loader.rb

@@ -18,5 +18,6 @@ module ConfigBuilder
     end
 
     require 'config_builder/loader/yaml'
+    require 'config_builder/loader/yaml_erb'
   end
 end

data/lib/config_builder/model/provider/libvirt.rb

@@ -0,0 +1,108 @@
+# @see http://github.com/pradels/vagrant-libvirt
+class ConfigBuilder::Model::Provider::Libvirt < ConfigBuilder::Model::Base
+
+  # @!attribute [rw] uri
+  #   @return [String] Manually specify URI
+  def_model_attribute :uri
+
+  # @!attribute [rw] driver
+  #   @return [String] A hypervisor name to access via Libvirt.
+  def_model_attribute :driver
+
+  # @!attribute [rw] host
+  #   @return [String] The name of the server, where libvirtd is running.
+  def_model_attribute :host
+
+  # @!attribute [rw] connect_via_ssh
+  #   @return [String] If use ssh tunnel to connect to Libvirt.
+  def_model_attribute :connect_via_ssh 
+
+  # @!attribute [rw] socket
+  #   @return [String] Path towards the libvirt socket
+  def_model_attribute :socket
+
+  # @!attribute [rw] username
+  #   @return [String] The username to access Libvirt.
+  def_model_attribute :username
+
+  # @!attribute [rw] password
+  #   @return [String] Password for Libvirt connection.
+  def_model_attribute :password
+
+  # @!attribute [rw] id_ssh_key_file
+  #   @return [String] ID SSH key file
+  def_model_attribute :id_ssh_key_file
+
+  # @!attribute [rw] storage_pool_name
+  #   @return [String] Libvirt storage pool name, where box image and instance
+  #   snapshots will be stored.
+  def_model_attribute :storage_pool_name
+
+  # @!attribute [rw] random_hostname
+  #   @return [String] Turn on to prevent hostname conflicts
+  def_model_attribute :random_hostname
+
+  # @!attribute [rw] management_network_name
+  #   @return [String] Libvirt default network name
+  def_model_attribute :management_network_name
+
+  # @!attribute [rw] management_network_address
+  #   @return [String] Libvirt default network address
+  def_model_attribute :management_network_address
+
+  # @!attribute [rw] default_prefix
+  #   @return [String] Default host prefix (alternative to use project folder
+  #   name)
+  def_model_attribute :default_prefix
+
+  # Domain specific settings used while creating new domain.
+  def_model_attribute :memory
+  def_model_attribute :cpus
+  def_model_attribute :cpu_mode
+  def_model_attribute :disk_bus
+  def_model_attribute :nested
+  def_model_attribute :volume_cache
+  def_model_attribute :kernel
+  def_model_attribute :cmd_line
+  def_model_attribute :initrd
+
+  def initialize
+    @defaults = {}
+  end
+
+  def to_proc
+    Proc.new do |vm_config|
+      vm_config.provider 'libvirt' do |vb_config|
+
+        with_attr(:uri)               { |val| vb_config.host = val }
+        with_attr(:driver)            { |val| vb_config.host = val }
+        with_attr(:host)              { |val| vb_config.host = val }
+        with_attr(:connect_via_ssh)   { |val| vb_config.connect_via_ssh = val }
+        with_attr(:socket)            { |val| vb_config.socket = val }
+        with_attr(:username)          { |val| vb_config.username = val }
+        with_attr(:password)          { |val| vb_config.username = val }
+        with_attr(:id_ssh_key_file)   { |val| vb_config.id_ssh_key_file = val }
+        with_attr(:storage_pool_name) { |val| vb_config.storage_pool_name = val }
+        with_attr(:random_hostname)   { |val| vb_config.random_hostname = val }
+        with_attr(:management_network_name) { |val|
+          vb_config.username = val
+        }
+        with_attr(:management_network_address) { |val|
+          vb_config.username = val
+        }
+        with_attr(:default_prefix)    { |val| vb_config.username = val }
+        with_attr(:memory)            { |val| vb_config.memory = val }
+        with_attr(:cpus)              { |val| vb_config.cpus = val }
+        with_attr(:cpu_mode)          { |val| vb_config.cpu_mode = val }
+        with_attr(:disk_bus)          { |val| vb_config.disk_bus = val }
+        with_attr(:nested)            { |val| vb_config.nested = val }
+        with_attr(:volume_cache)      { |val| vb_config.volume_cache = val }
+        with_attr(:kernel)            { |val| vb_config.kernel = val }
+        with_attr(:cmd_line)          { |val| vb_config.cmd_line = val }
+        with_attr(:initrd)            { |val| vb_config.initrd = val }
+      end
+    end
+  end
+
+  ConfigBuilder::Model::Provider.register('libvirt', self)
+end

data/lib/config_builder/model/provider/vmware.rb

@@ -0,0 +1,40 @@
+# @see http://docs.vagrantup.com/v2/vmware/configuration.html
+class ConfigBuilder::Model::Provider::VMware < ConfigBuilder::Model::Base
+
+  # @!attribute [rw] vmx
+  #   @return [Hash<String, String>] A hash of VMX options for the given VM
+  #   @example
+  #     model.vmx = {
+  #       'memsize'  => '1024',
+  #       'numvcpus' => '2',
+  #     }
+  def_model_attribute :vmx
+
+  # @!attribute [rw] gui
+  #   @return [Boolean] Whether the GUI should be launched when the VM is created
+  def_model_attribute :gui
+
+  def initialize
+    @defaults = {
+      :gui => false,
+      :vmx => {},
+    }
+
+    @providers ||= %w[vmware_fusion vmware_workstation]
+  end
+
+  def to_proc
+    Proc.new do |vm_config|
+      @providers.each do |vmware_provider|
+        vm_config.provider vmware_provider do |config|
+          config.gui = attr(:gui)
+          attr(:vmx).each_pair do |key, value|
+            config.vmx[key] = value
+          end
+        end
+      end
+    end
+  end
+
+  ConfigBuilder::Model::Provider.register('vmware', self)
+end

data/lib/config_builder/model/provider/vmware_fusion.rb

@@ -1,35 +1,7 @@
-# @see http://docs.vagrantup.com/v2/vmware/configuration.html
-class ConfigBuilder::Model::Provider::VMwareFusion < ConfigBuilder::Model::Base
-
-  # @!attribute [rw] vmx
-  #   @return [Hash<String, String>] A hash of VMX options for the given VM
-  #   @example
-  #     model.vmx = {
-  #       'memsize'  => '1024',
-  #       'numvcpus' => '2',
-  #     }
-  def_model_attribute :vmx
-
-  # @!attribute [rw] gui
-  #   @return [Boolean] Whether the GUI should be launched when the VM is created
-  def_model_attribute :gui
-
+class ConfigBuilder::Model::Provider::VMwareFusion < ConfigBuilder::Model::Provider::VMware
   def initialize
-    @defaults = {
-      :gui => false,
-      :vmx => {},
-    }
-  end
-
-  def to_proc
-    Proc.new do |vm_config|
-      vm_config.provider 'vmware_fusion' do |fusion_config|
-        fusion_config.gui = attr(:gui)
-        attr(:vmx).each_pair do |key, value|
-          fusion_config.vmx[key] = value
-        end
-      end
-    end
+    @providers = %w[vmware_fusion]
+    super
   end
 
   ConfigBuilder::Model::Provider.register('vmware_fusion', self)

data/lib/config_builder/model/provider/vmware_workstation.rb

@@ -0,0 +1,8 @@
+class ConfigBuilder::Model::Provider::VMwareWorkstation < ConfigBuilder::Model::Provider::VMware
+  def initialize
+    @providers = %w[vmware_workstation]
+    super
+  end
+
+  ConfigBuilder::Model::Provider.register('vmware_workstation', self)
+end

data/lib/config_builder/model/provider/vsphere.rb

@@ -0,0 +1,30 @@
+# @see https://github.com/nsidc/vagrant-vsphere
+class ConfigBuilder::Model::Provider::Vsphere< ConfigBuilder::Model::Base
+
+  VSPHERE_ATTRIBUTES = [ :host, :insecure, :user, :password, :data_center_name, :compute_resource_name, :resource_pool_name, :clone_from_vm, :template_name, :name, :vm_base_path, :customization_spec_name, :data_store_name, :linked_clone, :proxy_host, :proxy_port, :vlan ]
+
+  # @!attribute [rw]
+  # The mandatory attributes will be verified by vagrant-vsphere
+  # @see https://github.com/nsidc/vagrant-vsphere#configuration
+  VSPHERE_ATTRIBUTES.each do |key|
+    def_model_attribute attr
+  end
+
+  def initialize
+    @defaults = {
+      :insecure => false,
+    }
+  end
+
+  def to_proc
+    Proc.new do |vm_config|
+      vm_config.provider 'vsphere' do |config|
+        VSPHERE_ATTRIBUTES.each do |key|
+          config.send("#{key}=", attr(key)) if attr(key)
+        end
+      end
+    end
+  end
+
+  ConfigBuilder::Model::Provider.register('vsphere', self)
+end

data/lib/config_builder/model/provisioner/file.rb

@@ -0,0 +1,24 @@
+# @see http://docs.vagrantup.com/v2/provisioning/file.html
+class ConfigBuilder::Model::Provisioner::File < ConfigBuilder::Model::Base
+  # @!attribute [rw] source
+  #   @return [Source] Is the local path of the file to be uploaded.
+  def_model_attribute :source
+
+  # @!attribute [rw] destination
+  #   @return [Source] Is the remote path on the guest machine where the file
+  #     will be uploaded to. The file is uploaded as the SSH user over SCP, so
+  #     this location must be writable to that user. The SSH user can be
+  #     determined by running vagrant ssh-config, and defaults to "vagrant".
+  def_model_attribute :destination
+
+  def to_proc
+    Proc.new do |vm_config|
+      vm_config.provision :file do |file_config|
+        with_attr(:source)        { |val| file_config.source = val }
+        with_attr(:destination)   { |val| file_config.destination = val }
+      end
+    end
+  end
+
+  ConfigBuilder::Model::Provisioner.register('file', self)
+end

data/lib/config_builder/model.rb

@@ -39,7 +39,11 @@ module ConfigBuilder
       end
 
       require 'config_builder/model/provider/virtualbox'
+      require 'config_builder/model/provider/vmware'
       require 'config_builder/model/provider/vmware_fusion'
+      require 'config_builder/model/provider/vmware_workstation'
+      require 'config_builder/model/provider/libvirt'
+      require 'config_builder/model/provider/vsphere'
     end
 
     module Provisioner

data/lib/config_builder/version.rb

@@ -1,3 +1,3 @@
 module ConfigBuilder
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-config_builder
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -64,12 +64,18 @@ files:
 - lib/config_builder/filter_stack.rb
 - lib/config_builder/loader.rb
 - lib/config_builder/loader/yaml.rb
+- lib/config_builder/loader/yaml_erb.rb
 - lib/config_builder/model.rb
 - lib/config_builder/model/base.rb
 - lib/config_builder/model/network/forwarded_port.rb
 - lib/config_builder/model/network/private_network.rb
+- lib/config_builder/model/provider/libvirt.rb
 - lib/config_builder/model/provider/virtualbox.rb
+- lib/config_builder/model/provider/vmware.rb
 - lib/config_builder/model/provider/vmware_fusion.rb
+- lib/config_builder/model/provider/vmware_workstation.rb
+- lib/config_builder/model/provider/vsphere.rb
+- lib/config_builder/model/provisioner/file.rb
 - lib/config_builder/model/provisioner/puppet.rb
 - lib/config_builder/model/provisioner/puppet_server.rb
 - lib/config_builder/model/provisioner/shell.rb