opendev/system-config
Code Issues Proposed changes

Move unbound to openstack_project::server

Browse Source 
Once nodepool is installing and fully configuring unbound, we don't need
to manage it in the common openstack_project::template class. This patch
moves them over to openstack_project::server so that it is obvious that
puppet doesn't need to manage them for both single-use workers and
long-lived servers. Eventually the openstack_project::template class
should be empty and we can remove it.

Depends-On: I3905be12acd85581a608d87ba5159cc883343a37
Change-Id: Ie1daae8471d424f373b47262e9d0b21c15affce9
This commit is contained in:
Colleen Murphy 2017-04-02 21:45:28 +02:00
parent dccba790ae
commit 4f734e0738
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/openstack_project/manifests/server.pp
View File

@ -74,6 +74,16 @@ class openstack_project::server (
} }
} }
###########################################################
# Process if ( $high_level_directive ) blocks
if ($enable_unbound) {
class { 'unbound':
install_resolv_conf => $install_resolv_conf
}
}
class { 'openstack_project::template': class { 'openstack_project::template':
iptables_public_tcp_ports => $iptables_public_tcp_ports, iptables_public_tcp_ports => $iptables_public_tcp_ports,
iptables_public_udp_ports => $iptables_public_udp_ports, iptables_public_udp_ports => $iptables_public_udp_ports,
@ -83,7 +93,6 @@ class openstack_project::server (
pin_puppet => $pin_puppet, pin_puppet => $pin_puppet,
ca_server => $ca_server, ca_server => $ca_server,
puppetmaster_server => $puppetmaster_server, puppetmaster_server => $puppetmaster_server,
enable_unbound => $enable_unbound,
afs => $afs, afs => $afs,
afs_cache_size => $afs_cache_size, afs_cache_size => $afs_cache_size,
manage_exim => $manage_exim, manage_exim => $manage_exim,

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

@ -14,7 +14,6 @@ class openstack_project::single_use_slave (
$thin = true, $thin = true,
$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,
$jenkins_gitfullname = 'OpenStack Jenkins', $jenkins_gitfullname = 'OpenStack Jenkins',
$jenkins_gitemail = 'jenkins@openstack.org', $jenkins_gitemail = 'jenkins@openstack.org',
@ -25,7 +24,6 @@ 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,
permit_root_login => 'yes', permit_root_login => 'yes',
iptables_rules4 => iptables_rules4 =>
[ [

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

@ -13,7 +13,6 @@ class openstack_project::template (
$automatic_upgrades = true, $automatic_upgrades = true,
$certname = $::fqdn, $certname = $::fqdn,
$ca_server = undef, $ca_server = undef,
$enable_unbound = true,
$afs = false, $afs = false,
$afs_cache_size = 500000, $afs_cache_size = 500000,
$puppetmaster_server = 'puppetmaster.openstack.org', $puppetmaster_server = 'puppetmaster.openstack.org',
@ -95,12 +94,6 @@ class openstack_project::template (
install_users => $install_users install_users => $install_users
} }
if ($enable_unbound) {
class { 'unbound':
install_resolv_conf => $install_resolv_conf
}
}
package { 'rsyslog': package { 'rsyslog':
ensure => present, ensure => present,
} }