opendev/system-config
Code Issues Proposed changes

Merge "Clean up openstack_project::server for kdc01 / kdc02"

Browse Source
This commit is contained in:
Zuul 2017-12-15 17:54:13 +00:00 committed by Gerrit Code Review
commit c449cf0335
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/site.pp
View File

@ -1605,16 +1605,25 @@ node 'single-node-ci.test.only' {
# Node-OS: trusty # Node-OS: trusty
node 'kdc01.openstack.org' { node 'kdc01.openstack.org' {
class { 'openstack_project::kdc': class { 'openstack_project::server':
sysadmins => hiera('sysadmins', []), iptables_public_tcp_ports => [88, 464, 749, 754],
iptables_public_udp_ports => [88, 464, 749],
sysadmins => hiera('sysadmins', []),
} }
class { 'openstack_project::kdc': }
} }
# Node-OS: trusty # Node-OS: trusty
node 'kdc02.openstack.org' { node 'kdc02.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [88, 464, 749, 754],
iptables_public_udp_ports => [88, 464, 749],
sysadmins => hiera('sysadmins', []),
}
class { 'openstack_project::kdc': class { 'openstack_project::kdc':
sysadmins => hiera('sysadmins', []), slave => true,
slave => true,
} }
} }

6
modules/openstack_project/manifests/kdc.pp
View File

@ -1,13 +1,7 @@
# kerberos kdc servers # kerberos kdc servers
class openstack_project::kdc ( class openstack_project::kdc (
$slave = false, $slave = false,
$sysadmins = [],
) { ) {
class { 'openstack_project::server':
iptables_public_tcp_ports => [88,464,749,754],
iptables_public_udp_ports => [88,464,749],
sysadmins => $sysadmins
}
class { 'kerberos::server': class { 'kerberos::server':
realm => 'OPENSTACK.ORG', realm => 'OPENSTACK.ORG',
kdcs => [ kdcs => [