opendev/system-config
Code Issues Proposed changes

Move afs servers to using o_p::template

Browse Source 
This is part of a multi-stage process to merge o_p::server and
o_p::template.

Change-Id: I3bd3242a26fe701741a7784ae4e10e4183be17cf
This commit is contained in:
Spencer Krum 2015-05-06 15:43:27 -07:00
parent ac0c30f828
commit e8c4b397ce
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/site.pp
View File

@ -715,10 +715,11 @@ node 'kdc02.openstack.org' {
node /^afsdb.*\.openstack\.org$/ { node /^afsdb.*\.openstack\.org$/ {
$group = "afsdb" $group = "afsdb"
class { 'openstack_project::server': class { 'openstack_project::template':
iptables_public_udp_ports => [7000,7002,7003,7004,7005,7006,7007], iptables_public_udp_ports => [7000,7002,7003,7004,7005,7006,7007],
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
afs => true, afs => true,
manage_exim => true,
} }
include openstack_project::afsdb include openstack_project::afsdb
@ -728,10 +729,11 @@ node /^afsdb.*\.openstack\.org$/ {
node /^afs.*\..*\.openstack\.org$/ { node /^afs.*\..*\.openstack\.org$/ {
$group = "afs" $group = "afs"
class { 'openstack_project::server': class { 'openstack_project::template':
iptables_public_udp_ports => [7000,7002,7003,7004,7005,7006,7007], iptables_public_udp_ports => [7000,7002,7003,7004,7005,7006,7007],
sysadmins => hiera('sysadmins', []), sysadmins => hiera('sysadmins', []),
afs => true, afs => true,
manage_exim => true,
} }
include openstack_project::afsfs include openstack_project::afsfs

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

@ -15,6 +15,6 @@ class openstack_project::afsfs (
ip => '23.253.200.228', ip => '23.253.200.228',
}, },
], ],
require => Class['Openstack_project::Server'], require => Class['Openstack_project::Template'],
} }
} }