Merge "Move afs servers to using o_p::template"

This commit is contained in:
Jenkins 2015-05-14 14:02:51 +00:00 committed by Gerrit Code Review
commit 6d33750309
2 changed files with 5 additions and 3 deletions

View File

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

View File

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