diff options
author | varac <varacanero@zeromail.org> | 2013-09-17 18:52:36 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2013-09-17 18:52:36 +0200 |
commit | a9296de31af36dcedcc930052d2c589b6d77b149 (patch) | |
tree | 7b8da54b54b42c943cf132fb4a020654b419fd15 /puppet/modules/site_config/manifests/params.pp | |
parent | c5d4a716ffc8bad1a0a634438245eb02452ed43d (diff) | |
parent | 5ca8f6f9d26a2c2abfa9f1752aad6b8d91020074 (diff) |
Merge branch 'feature/2399_shorewall_on_vagrant_fails' into develop
Diffstat (limited to 'puppet/modules/site_config/manifests/params.pp')
-rw-r--r-- | puppet/modules/site_config/manifests/params.pp | 4 |
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") |