beaker-vagrant 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98a299de5416fe4cbbd2a865bbba1afdb75ad1ed0d32f43495d055b12652eb17
-  data.tar.gz: 8277b502cb524396bd7ec8b1e4beae7966d3a365c5a5ce6330272b85c2b16141
+  metadata.gz: b4a6b7fd05dbad3dad572da7c2dcb0b6331d99759360ee6f13190dd663e4cb0c
+  data.tar.gz: 522a13a0e13bbbe36c0f789f9e1583f92cb09fddbe79c435c2b5d48c9b779c26
 SHA512:
-  metadata.gz: c703f74e712e9cae4f596f50bdbf6f6ede7d9586507c47be5614f6fcfa309dde383e64140a08d8dc8464f17bd5a1d4a3b85434d2f1be8463247c63eef8320f80
-  data.tar.gz: 3395d540e69595342585485776a50f79067c137d4443d12664c38030c0c7120c4b07c92127973ca0d02813e09d33c2c1aa1505151dacce4cf20a50efe3d29b7e
+  metadata.gz: 41f1d7d61261464c2a1fafff23cc69c27cc8f7257ff6fd7f387cf4227e0e66fd3227c8ac56f0c7c7275c2dab409a9e1e635acd83f2a62b3554f97dbd0dc58741
+  data.tar.gz: bd51b818aea92e155e2c444d15d1db7e5423c09ad7ac667c4d92380438f5bcfc665cc2310e7ddd9abded88c45428ab512b609ed557ba0f638e1e49ba787fec37

data/.travis.yml

@@ -0,0 +1,14 @@
+---
+os:
+  - linux
+before_install:
+  - gem update --system 2.2.1
+  - gem --version
+language: ruby
+script: "bundle exec rake test:spec:run"
+notifications:
+  email: false
+rvm:
+  - 2.6
+  - 2.5
+  - 2.4

data/docs/vagrant.md

@@ -1,5 +1,21 @@
 # Vagrant
 
+<!-- vim-markdown-toc GFM -->
+
+  * [Getting Started](#getting-started)
+    * [Requirements](#requirements)
+    * [Setup a Vagrant Hosts File](#setup-a-vagrant-hosts-file)
+* [Vagrant-Specific Hosts File Settings](#vagrant-specific-hosts-file-settings)
+    * [Running With a GUI](#running-with-a-gui)
+    * [Mounting Local Folders](#mounting-local-folders)
+    * [Forwarding Ports to Guest](#forwarding-ports-to-guest)
+    * [Volumes Support](#volumes-support)
+    * [Adding vagrant shell provisioner](#adding-vagrant-shell-provisioner)
+    * [Using the host's resolver as a DNS proxy in NAT mode (virtualbox only)](#using-the-hosts-resolver-as-a-dns-proxy-in-nat-mode-virtualbox-only)
+* [vagrant plugins](#vagrant-plugins)
+
+<!-- vim-markdown-toc -->
+
 Vagrant's slogan is "development environments made easy". Vagrant provides an
 abstraction on top of a VM or cloud provider that allows you to manage
 hosts and their provisioning. <https://www.vagrantup.com/>.
@@ -211,8 +227,30 @@ When using the Vagrant Hypervisor, beaker can create the Vagrantfile with a shel
 
 In the above, beaker will create a Vagrantfile which runs the above shell script on the Agent guest.
 
+### Using the host's resolver as a DNS proxy in NAT mode (virtualbox only)
+
+When using the Vagrant hypervisor with the virtualbox provider, beaker can
+configure the VirtualBox NAT engine's DHCP sever to proxy DNS queries through
+to the host's resolver using the `natdns` setting in the nodeset file.
+
+**Example hosts file**
+
+    HOSTS:
+      el7-server:
+        roles:
+          - default
+        platform: el-7-x86_64
+        box: centos/7
+        hypervisor: vagrant
+        natdns: on
+        yum_repos:
+          epel:
+            mirrorlist: 'https://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=$basearch&country=us'
+            gpgkeys:
+              - https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever
+
 # vagrant plugins #
 
-You can check more information for some suported vagrant plugins:
+You can check more information for some supported vagrant plugins:
 
  - [vagrant-libvirt](vagrant_libvirt.md)

data/lib/beaker-vagrant/version.rb

@@ -1,3 +1,3 @@
 module BeakerVagrant
-  VERSION = '0.6.4'
+  VERSION = '0.6.5'
 end

data/lib/beaker/hypervisor/vagrant_virtualbox.rb

@@ -63,15 +63,15 @@ class Beaker::VagrantVirtualbox < Beaker::Vagrant
       end
     end
 
-    provider_section << "      vb.customize [\"modifyvm\", :id, \"--ioapic\", \"on\"]\n" unless host['ioapic'].nil?
+    provider_section << "      vb.customize ['modifyvm', :id, '--ioapic', 'on']\n" unless host['ioapic'].nil?
 
-    provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnshostresolver1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
+    provider_section << "      vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']\n" unless host['natdns'].nil?
 
-    provider_section << "      vb.customize [\"modifyvm\", :id, \"--natdnsproxy1\", \"#{host['natdns']}\"]\n" unless host['natdns'].nil?
+    provider_section << "      vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']\n" unless host['natdns'].nil?
 
     provider_section << "      vb.gui = true\n" unless host['vb_gui'].nil?
 
-    provider_section << "      [\"modifyvm\", :id, \"--cpuidset\", \"1\",\"000206a7\",\"02100800\",\"1fbae3bf\",\"bfebfbff\"\]" if /osx/i.match(host['platform'])
+    provider_section << "      vb.customize ['modifyvm', :id, '--cpuidset', '1','000206a7','02100800','1fbae3bf','bfebfbff']\n" if /osx/i.match(host['platform'])
 
     if host['disk_path']
       unless File.exist?(host['disk_path'])

data/spec/beaker/hypervisor/vagrant_virtualbox_spec.rb

@@ -3,6 +3,10 @@ require 'spec_helper'
 describe Beaker::VagrantVirtualbox do
   let( :options ) { make_opts.merge({ :hosts_file => 'sample.cfg', 'logger' => double().as_null_object }) }
   let( :vagrant ) { Beaker::VagrantVirtualbox.new( @hosts, options ) }
+  let(:vagrantfile_path) do
+    path = vagrant.instance_variable_get( :@vagrant_path )
+    File.expand_path( File.join( path, 'Vagrantfile' ))
+  end
 
   before :each do
     @hosts = make_hosts()
@@ -41,14 +45,23 @@ describe Beaker::VagrantVirtualbox do
 
   end
 
-  it "can enable ioapic(multiple cores) on hosts" do 
+  it "can enable ioapic(multiple cores) on hosts" do
     path = vagrant.instance_variable_get( :@vagrant_path )
     hosts = make_hosts({:ioapic => 'true'},1)
 
     vagrant.make_vfile( hosts )
 
     vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include( %Q{ vb.customize ["modifyvm", :id, "--ioapic", "on"]})
+    expect( vagrantfile ).to include( " vb.customize ['modifyvm', :id, '--ioapic', 'on']")
+  end
+
+  it "can enable NAT DNS on hosts" do
+    hosts = make_hosts({:natdns => 'on'},1)
+    vagrant.make_vfile( hosts )
+    vagrantfile = File.read( vagrantfile_path )
+
+    expect( vagrantfile ).to include( " vb.customize ['modifyvm', :id, '--natdnshostresolver1', 'on']")
+    expect( vagrantfile ).to include( " vb.customize ['modifyvm', :id, '--natdnsproxy1', 'on']")
   end
 
   it "correctly provisions storage with the USB controller" do
@@ -57,10 +70,10 @@ describe Beaker::VagrantVirtualbox do
 
     vagrant.make_vfile( hosts )
     vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include(%Q{ vb.customize ['modifyvm', :id, '--usb', 'on']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storagectl', :id, '--name', 'Beaker USB Controller', '--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storageattach', :id, '--storagectl', 'Beaker USB Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']})
+    expect( vagrantfile ).to include(" vb.customize ['modifyvm', :id, '--usb', 'on']")
+    expect( vagrantfile ).to include(" vb.customize ['storagectl', :id, '--name', 'Beaker USB Controller', '--add', 'usb', '--portcount', '8', '--controller', 'USB', '--bootable', 'off']")
+    expect( vagrantfile ).to include(" vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']")
+    expect( vagrantfile ).to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker USB Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
   end
 
   it "correctly provisions storage with the LSILogic controller" do
@@ -69,9 +82,9 @@ describe Beaker::VagrantVirtualbox do
 
     vagrant.make_vfile( hosts )
     vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storagectl', :id, '--name', 'Beaker LSILogic Controller', '--add', 'scsi', '--portcount', '16', '--controller', 'LSILogic', '--bootable', 'off']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storageattach', :id, '--storagectl', 'Beaker LSILogic Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']})
+    expect( vagrantfile ).to include(" vb.customize ['storagectl', :id, '--name', 'Beaker LSILogic Controller', '--add', 'scsi', '--portcount', '16', '--controller', 'LSILogic', '--bootable', 'off']")
+    expect( vagrantfile ).to include(" vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']")
+    expect( vagrantfile ).to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker LSILogic Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
   end
 
   it "correctly provisions storage with the default controller" do
@@ -80,8 +93,8 @@ describe Beaker::VagrantVirtualbox do
 
     vagrant.make_vfile( hosts )
     vagrantfile = File.read( File.expand_path( File.join( path, 'Vagrantfile' )))
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storagectl', :id, '--name', 'Beaker IntelAHCI Controller', '--add', 'sata', '--portcount', '2', '--controller', 'IntelAHCI', '--bootable', 'off']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']})
-    expect( vagrantfile ).to include(%Q{ vb.customize ['storageattach', :id, '--storagectl', 'Beaker IntelAHCI Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']})
+    expect( vagrantfile ).to include(" vb.customize ['storagectl', :id, '--name', 'Beaker IntelAHCI Controller', '--add', 'sata', '--portcount', '2', '--controller', 'IntelAHCI', '--bootable', 'off']")
+    expect( vagrantfile ).to include(" vb.customize ['createhd', '--filename', 'vm1-test_disk.vdi', '--size', '5120']")
+    expect( vagrantfile ).to include(" vb.customize ['storageattach', :id, '--storagectl', 'Beaker IntelAHCI Controller', '--port', '0', '--device', '0', '--type', 'hdd', '--medium', 'vm1-test_disk.vdi']")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -147,6 +147,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md