opendev/system-config
Code Issues Proposed changes

Merge "Make use of unbound optional"

Browse Source
This commit is contained in:
Jenkins 2014-08-12 19:37:50 +00:00 committed by Gerrit Code Review
commit 21eceaf7a2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/single_use_slave.pp
View File

@ -16,6 +16,7 @@ class openstack_project::single_use_slave (
$include_pypy = false, $include_pypy = false,
$automatic_upgrades = false, $automatic_upgrades = false,
$all_mysql_privs = false, $all_mysql_privs = false,
$enable_unbound = true,
$ssh_key = $openstack_project::jenkins_ssh_key $ssh_key = $openstack_project::jenkins_ssh_key
) inherits openstack_project { ) inherits openstack_project {
class { 'openstack_project::template': class { 'openstack_project::template':
@ -23,6 +24,7 @@ class openstack_project::single_use_slave (
automatic_upgrades => $automatic_upgrades, automatic_upgrades => $automatic_upgrades,
install_users => $install_users, install_users => $install_users,
install_resolv_conf => $install_resolv_conf, install_resolv_conf => $install_resolv_conf,
enable_unbound => $enable_unbound,
iptables_rules4 => iptables_rules4 =>
[ [
# Ports 69 and 6385 allow to allow ironic VM nodes to reach tftp and # Ports 69 and 6385 allow to allow ironic VM nodes to reach tftp and

7
modules/openstack_project/manifests/template.pp
View File

@ -13,6 +13,7 @@ class openstack_project::template (
$automatic_upgrades = true, $automatic_upgrades = true,
$certname = $::fqdn, $certname = $::fqdn,
$ca_server = undef, $ca_server = undef,
$enable_unbound = true,
) { ) {
include ssh include ssh
include snmpd include snmpd
@ -48,8 +49,10 @@ class openstack_project::template (
ensure => present, ensure => present,
} }
class { 'unbound': if ($enable_unbound) {
install_resolv_conf => $install_resolv_conf class { 'unbound':
install_resolv_conf => $install_resolv_conf
}
} }
if $::osfamily == 'Debian' { if $::osfamily == 'Debian' {