diff --git a/modules/openstack_project/manifests/single_use_slave.pp b/modules/openstack_project/manifests/single_use_slave.pp index f4061f94cf..eba1f51572 100644 --- a/modules/openstack_project/manifests/single_use_slave.pp +++ b/modules/openstack_project/manifests/single_use_slave.pp @@ -16,6 +16,7 @@ class openstack_project::single_use_slave ( $include_pypy = false, $automatic_upgrades = false, $all_mysql_privs = false, + $enable_unbound = true, $ssh_key = $openstack_project::jenkins_ssh_key ) inherits openstack_project { class { 'openstack_project::template': @@ -23,6 +24,7 @@ class openstack_project::single_use_slave ( automatic_upgrades => $automatic_upgrades, install_users => $install_users, install_resolv_conf => $install_resolv_conf, + enable_unbound => $enable_unbound, iptables_rules4 => [ # Ports 69 and 6385 allow to allow ironic VM nodes to reach tftp and diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp index d13e07eb51..9c32acc4a5 100644 --- a/modules/openstack_project/manifests/template.pp +++ b/modules/openstack_project/manifests/template.pp @@ -13,6 +13,7 @@ class openstack_project::template ( $automatic_upgrades = true, $certname = $::fqdn, $ca_server = undef, + $enable_unbound = true, ) { include ssh include snmpd @@ -48,8 +49,10 @@ class openstack_project::template ( ensure => present, } - class { 'unbound': - install_resolv_conf => $install_resolv_conf + if ($enable_unbound) { + class { 'unbound': + install_resolv_conf => $install_resolv_conf + } } if $::osfamily == 'Debian' {