From 0c09b73e13dc32961e651f8d29c570df61aee18e Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 15 Dec 2017 11:01:06 -0500 Subject: [PATCH] Clean up openstack_project::server for kdc01 / kdc02 Move openstack_project::server into site.pp like other nodes, this was the old way of provisioning servers. Change-Id: If36ace9c377881e25d30e1f7f0184383b894ca17 Signed-off-by: Paul Belanger --- manifests/site.pp | 17 +++++++++++++---- modules/openstack_project/manifests/kdc.pp | 6 ------ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 3029496f27..aa9081de00 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -1625,16 +1625,25 @@ node 'single-node-ci.test.only' { # Node-OS: trusty node 'kdc01.openstack.org' { - class { 'openstack_project::kdc': - sysadmins => hiera('sysadmins', []), + 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': } } # Node-OS: trusty 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': - sysadmins => hiera('sysadmins', []), - slave => true, + slave => true, } } diff --git a/modules/openstack_project/manifests/kdc.pp b/modules/openstack_project/manifests/kdc.pp index 639c069310..258af88b5e 100644 --- a/modules/openstack_project/manifests/kdc.pp +++ b/modules/openstack_project/manifests/kdc.pp @@ -1,13 +1,7 @@ # kerberos kdc servers class openstack_project::kdc ( $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': realm => 'OPENSTACK.ORG', kdcs => [