Merge "add ofextensions-epc project settings macro"

[releng/builder.git] / vagrant / lib / lf-networking / confignetwork.pp

diff --git a/vagrant/lib/lf-networking/confignetwork.pp b/vagrant/lib/lf-networking/confignetwork.pp
index b6cdd8aacb783fd9c027603c8e2258366b5e645a..e60df0cdf986b2efe6564a0b8c258b0b6cee2051 100644 (file)
--- a/vagrant/lib/lf-networking/confignetwork.pp
+++ b/vagrant/lib/lf-networking/confignetwork.pp
@@ -91,7 +91,10 @@ resolv_conf:
 }
 
 file_line { 'add_resolver':
-  path  => '/etc/cloud/cloud.cfg.d/10_rackspace.cfg',
+  path       => $::operatingsystem ? {
+    'Ubuntu' => '/etc/cloud/cloud.cfg',
+    default  => '/etc/cloud/cloud.cfg.d/10_rackspace.cfg',
+  },
   line  => ' - resolv_conf',
   after => ' - update_etc_hosts',
 }
@@ -115,6 +118,13 @@ case $::operatingsystem {
       content => "#!/bin/sh\nip route add default via ${router} dev eth0",
       mode    => '0755',
     }
+
+    file { '/etc/resolvconf/resolv.conf.d/tail':
+      content => "# opendaylight dns
+nameserver ${ns1}
+nameserver ${ns2}
+",
+    }
   }
   default: {
     notice ("${::operatingsystem} is not supported by this configuration")