summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2013-09-17 18:00:32 +0200
committervarac <varacanero@zeromail.org>2013-09-17 18:51:21 +0200
commitecb3727ad43ee55f07db067e80b9d74308296582 (patch)
treeeeedcb5f50dbb3e52877839acf104634f73a5303
parentc5d4a716ffc8bad1a0a634438245eb02452ed43d (diff)
site_config::params::interface should contain eth1 for vagrant cause it's the main interface we use (#2399, #2401)
-rw-r--r--puppet/modules/site_config/manifests/params.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/modules/site_config/manifests/params.pp b/puppet/modules/site_config/manifests/params.pp
index 20697042..a4657457 100644
--- a/puppet/modules/site_config/manifests/params.pp
+++ b/puppet/modules/site_config/manifests/params.pp
@@ -5,7 +5,7 @@ class site_config::params {
$ec2_local_ipv4_interface = getvar("interface_${::ec2_local_ipv4}")
if $::virtual == 'virtualbox' {
- $interface = [ 'eth0', 'eth1' ]
+ $interface = 'eth1'
}
elsif hiera('interface','') != '' {
$interface = hiera('interface')
@@ -17,7 +17,7 @@ class site_config::params {
$interface = $ec2_local_ipv4_interface
}
elsif $::interfaces =~ /eth0/ {
- $interface = eth0
+ $interface = 'eth0'
}
else {
fail("unable to determine a valid interface, please set a valid interface for this node in nodes/${::hostname}.json")