Forced provider to libvirt

Added ansible_env_vars to speed up the provisioning and eliminate login errors in packer log Added DEBIAN_FRONTEND="noninteractive" to have cleaner packer logs
ruzickap · Sep 18, 2016 · 7a4589b · 7a4589b
1 parent b97d401
commit 7a4589b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 7 deletions.
diff --git a/Vagrantfile-linux.template b/Vagrantfile-linux.template
@@ -1,10 +1,12 @@
-
 Vagrant.configure("2") do |config|
   config.vm.provider :libvirt do |libvirt|
     libvirt.disk_bus = "virtio"
     libvirt.nic_model_type = "virtio"
     libvirt.video_type = "qxl"
     libvirt.graphics_type = "spice"
   end
+
+  config.vm.provider "libvirt"
+  #Disable NFS sharing (==> default: Mounting NFS shared folders...)
   config.vm.synced_folder ".", "/vagrant", type: "nfs", disabled: true
 end
diff --git a/my-centos7.json b/my-centos7.json
@@ -27,7 +27,7 @@
       "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now",
 
       "accelerator": "kvm",
-      "qemuargs": [[ "-display", "gtk" ], [ "-m", "1024M" ]],
+      "qemuargs": [[ "-display", "gtk" ], [ "-m", "1G" ]],
       "boot_wait": "2s",
       "boot_command":
       [
@@ -48,6 +48,7 @@
     {
       "type": "ansible",
       "user": "vagrant",
+      "ansible_env_vars": [ "ANSIBLE_SSH_ARGS='-o ForwardAgent=no -o ControlMaster=auto -o ControlPersist=1h'" ],
       "playbook_file": "ansible/main.yml",
       "sftp_command": "/usr/libexec/openssh/sftp-server -e"
     },

diff --git a/my-ubuntu-server.json b/my-ubuntu-server.json
@@ -26,7 +26,7 @@
       "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now",
 
       "accelerator": "kvm",
-      "qemuargs": [[ "-display", "gtk" ], [ "-m", "1024M" ]],
+      "qemuargs": [[ "-display", "gtk" ], [ "-m", "1G" ]],
       "boot_wait": "2s",
       "boot_command":
       [
@@ -57,11 +57,13 @@
     },
     {
       "type": "shell",
-      "inline": ["sudo apt-get install -y aptitude python"]
+      "environment_vars": [ "DEBIAN_FRONTEND=noninteractive" ],
+      "inline": [ "sudo -E apt-get install -y aptitude python" ]
     },
     {
       "type": "ansible",
       "user": "vagrant",
+      "ansible_env_vars": [ "ANSIBLE_SSH_ARGS='-o ForwardAgent=no -o ControlMaster=auto -o ControlPersist=1h'" ],
       "playbook_file": "ansible/main.yml"
     },
     {

diff --git a/scripts/ubuntu/cleanup.sh b/scripts/ubuntu/cleanup.sh
@@ -1,6 +1,7 @@
 #!/bin/bash -eux
 
 SSH_USER=${SSH_USERNAME:-vagrant}
+export DEBIAN_FRONTEND="noninteractive"
 
 # Make sure udev does not block our network - http://6.ptmc.org/?p=164
 echo "==> Cleaning up udev rules"

diff --git a/scripts/ubuntu/update.sh b/scripts/ubuntu/update.sh
@@ -1,5 +1,7 @@
 #!/bin/bash -eux
 
+export DEBIAN_FRONTEND="noninteractive"
+
 # Update the box
-apt update
-apt -y upgrade
+apt-get update
+apt-get -y upgrade
diff --git a/ubuntu-server.json b/ubuntu-server.json
@@ -26,7 +26,7 @@
       "shutdown_command": "echo 'vagrant' | sudo -S shutdown -P now",
 
       "accelerator": "kvm",
-      "qemuargs": [[ "-display", "gtk" ], [ "-m", "1024M" ]],
+      "qemuargs": [[ "-display", "gtk" ], [ "-m", "1G" ]],
       "boot_wait": "2s",
       "boot_command":
       [