Merge tag 'v3.0.0' of github.com:ansiblebit/primogen

version 3.0.0

Author: steenzout

tests/Vagrantfile

@@ -17,27 +17,25 @@ Vagrant.configure('2') do |config|
     end
 
     # puts "[DEBUG] applying #{box_name} settings..."
-    config.vm.define "#{box_name}" do |host|
+    config.vm.define box_name do |host|
 
       host.vm.box = box_settings['box'] unless not box_settings.key? 'box'
       host.vm.hostname = box_name
 
       host.vm.network box_settings['network']['name'], ip: box_settings['network']['ip'] unless box_settings.key? 'network'
 
-      # puts "[DEBUG] applying virtualbox provider settings for #{box_name} box..."
-      config.vm.provider "#{box_settings['provider']}" do | provider |
-        box_settings['provider'].each do |key, value|
-          next if key == 'name'
-          provider.send("#{key}=", value)
-        end
+      # puts "[DEBUG] applying virtualbox settings for #{box_name} box..."
+      customize_args = [ "modifyvm", :id ]
+      box_settings['provider']['virtualbox'].collect { |k, v| customize_args |= ["--#{k}", v.to_s] }
+      host.vm.provider 'virtualbox' do |vb|
+        vb.customize customize_args
       end
-    end
-  end
-
 
-  # puts "[DEBUG] provision using ansible vagrant playbook..."
-  config.vm.provision 'ansible' do |ansible|
-    ansible.playbook = PLAYBOOK
-    ansible.verbose = 'v'
+      # puts "[DEBUG] provision using ansible vagrant playbook..."
+      host.vm.provision 'ansible' do |ansible|
+        ansible.playbook = PLAYBOOK
+        ansible.verbose = 'v'
+      end
+    end
   end
 end

tests/boxes.yml

@@ -15,9 +15,9 @@ vagrant:
       ip: 192.168.121.1
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   centos66-64.vagrant.dev:
     enabled: false
@@ -27,9 +27,9 @@ vagrant:
       ip: 192.168.121.2
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   centos7-64.vagrant.dev:
     enabled: false
@@ -39,9 +39,9 @@ vagrant:
       ip: 192.168.121.3
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
 
   # Debian
@@ -54,9 +54,9 @@ vagrant:
       ip: 192.168.122.1
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   wheezy64.vagrant.dev:
     enabled: true
@@ -66,9 +66,9 @@ vagrant:
       ip: 192.168.122.2
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
 
   # Fedora
@@ -81,9 +81,9 @@ vagrant:
       ip: 192.168.123.1
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   fedora20-64.vagrant.dev:
     enabled: false
@@ -93,9 +93,9 @@ vagrant:
       ip: 192.168.123.2
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   fedora21-32.vagrant.dev:
     enabled: false
@@ -105,9 +105,9 @@ vagrant:
       ip: 192.168.123.3
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   fedora21-64.vagrant.dev:
     enabled: false
@@ -117,9 +117,9 @@ vagrant:
       ip: 192.168.123.4
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   # Ubuntu
 
@@ -131,9 +131,9 @@ vagrant:
       ip: 192.168.124.1
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   precise64.vagrant.dev:
     enabled: true
@@ -143,9 +143,9 @@ vagrant:
       ip: 192.168.124.2
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   trusty32.vagrant.dev:
     enabled: false
@@ -155,9 +155,9 @@ vagrant:
       ip: 192.168.124.3
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   trusty64.vagrant.dev:
     enabled: true
@@ -167,9 +167,9 @@ vagrant:
       ip: 192.168.124.4
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   vivid32.vagrant.dev:
     enabled: false
@@ -179,9 +179,9 @@ vagrant:
       ip: 192.168.124.5
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1
 
   vivid64.vagrant.dev:
     enabled: true
@@ -191,6 +191,6 @@ vagrant:
       ip: 192.168.124.6
 
     provider:
-      name: virtualbox
-      memory: 1024
-      cpus: 1
+      virtualbox:
+        memory: 1024
+        cpus: 1

tests/vagrant.sh

@@ -60,7 +60,7 @@ do
             continue
         fi
 
-        . ${DIR}/test_idempotence.sh --box ${VAGRANT_BOX} --inventory $INVENTORY
+        bash ${DIR}/test_idempotence.sh --box ${VAGRANT_BOX} --inventory $INVENTORY
 
         echo "[INFO] destroy ${VAGRANT_BOX}..."
         vagrant destroy -f ${VAGRANT_BOX}