diff --git a/deployment/puppet/nailgun/examples/host-only.pp b/deployment/puppet/nailgun/examples/host-only.pp
index ea81c0f578..976070b765 100644
--- a/deployment/puppet/nailgun/examples/host-only.pp
+++ b/deployment/puppet/nailgun/examples/host-only.pp
@@ -35,6 +35,7 @@ class { 'nailgun::host':
   nailgun_user      => $nailgun_user,
   dns_domain        => $::fuel_settings['DNS_DOMAIN'],
   dns_search        => $::fuel_settings['DNS_SEARCH'],
+  dns_upstream      => split($::fuel_settings['DNS_UPSTREAM'], ','),
   repo_root         => "/var/www/nailgun/${::fuel_version['VERSION']['openstack_version']}",
   monitord_user     => $::fuel_settings['keystone']['monitord_user'],
   monitord_password => $::fuel_settings['keystone']['monitord_password'],
diff --git a/deployment/puppet/nailgun/manifests/host.pp b/deployment/puppet/nailgun/manifests/host.pp
index 667fe7e866..fb2c823131 100644
--- a/deployment/puppet/nailgun/manifests/host.pp
+++ b/deployment/puppet/nailgun/manifests/host.pp
@@ -3,6 +3,7 @@ $production,
 $cobbler_host = '127.0.0.1',
 $dns_search = 'domain.tld',
 $dns_domain = 'domain.tld',
+$dns_upstream = [],
 $nailgun_group = 'nailgun',
 $nailgun_user = 'nailgun',
 $gem_source = 'http://localhost/gems/',
diff --git a/deployment/puppet/nailgun/templates/resolv.conf.erb b/deployment/puppet/nailgun/templates/resolv.conf.erb
index 4e9541fd8c..d24b1ce1f9 100644
--- a/deployment/puppet/nailgun/templates/resolv.conf.erb
+++ b/deployment/puppet/nailgun/templates/resolv.conf.erb
@@ -1,3 +1,6 @@
 search <%= @dns_search %>
 domain <%= @dns_domain %>
 nameserver <%= @cobbler_host %>
+<%- @dns_upstream.each do |dns| -%>
+nameserver <%= dns %>
+<%- end -%>