opendev
/
system-config
Code Issues Proposed changes

Make use of unbound optional 

In some 3rd party ci systems, the installation of unbound
cause node image creation to fail and/or devstack-gate to fail.

Since it is not strictly necessary, allow it to be disabled in
environments that do not support it.

Change-Id: I906ae3ccf946e208e17c7087f89641d645db7111
Partial-Bug: #1307702
This commit is contained in:
Ramy Asselin 2014-07-24 15:59:18 -07:00
parent 142410fc33
commit 72975a3c5f
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,
$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

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

@ -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' {