From 61252fe74c8ec3668af551fb0b0b91f1bfa4705a Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Sun, 21 May 2017 23:28:20 +0200
Subject: [vagrant] Use eth1 on vagrant if present

Virtualbox adds eth1 as second interface when private networking
is enabled.

- Related: #7769
---
 puppet/modules/site_config/lib/facter/vagrant.rb |  8 ++++++++
 puppet/modules/site_config/manifests/params.pp   | 13 +++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 puppet/modules/site_config/lib/facter/vagrant.rb

(limited to 'puppet/modules/site_config')

diff --git a/puppet/modules/site_config/lib/facter/vagrant.rb b/puppet/modules/site_config/lib/facter/vagrant.rb
new file mode 100644
index 00000000..29a218dd
--- /dev/null
+++ b/puppet/modules/site_config/lib/facter/vagrant.rb
@@ -0,0 +1,8 @@
+# Checks if systems runs inside vagrant
+require 'facter'
+
+Facter.add(:vagrant) do
+  setcode do
+    FileTest.exists?('/vagrant')
+  end
+end
diff --git a/puppet/modules/site_config/manifests/params.pp b/puppet/modules/site_config/manifests/params.pp
index 012b3ce0..4627515a 100644
--- a/puppet/modules/site_config/manifests/params.pp
+++ b/puppet/modules/site_config/manifests/params.pp
@@ -1,3 +1,4 @@
+# Default parameters
 class site_config::params {
 
   $ip_address               = hiera('ip_address')
@@ -6,8 +7,16 @@ class site_config::params {
   $environment              = hiera('environment', undef)
 
 
-  if $environment == 'local' {
-    $interface = 'eth1'
+  if $::vagrant {
+    # Depending on the backend hypervisor networking is setup differently.
+    if $::interfaces =~ /eth1/ {
+      # Virtualbox: Private networking creates a second interface eth1
+      $interface = 'eth1'
+    }
+    else {
+      # KVM/Libvirt: Private networking is done by defauly on first interface
+      $interface = 'eth0'
+    }
     include site_config::packages::build_essential
   }
   elsif hiera('interface','') != '' {
-- 
cgit v1.2.3