From e8c4b397ce4fdc8cd165ee2e3fc3006b41e8c492 Mon Sep 17 00:00:00 2001 From: Spencer Krum Date: Wed, 6 May 2015 15:43:27 -0700 Subject: [PATCH] Move afs servers to using o_p::template This is part of a multi-stage process to merge o_p::server and o_p::template. Change-Id: I3bd3242a26fe701741a7784ae4e10e4183be17cf --- manifests/site.pp | 6 ++++-- modules/openstack_project/manifests/afsfs.pp | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 4640a4c5af..68d15a235a 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -715,10 +715,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 @@ -728,10 +729,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 diff --git a/modules/openstack_project/manifests/afsfs.pp b/modules/openstack_project/manifests/afsfs.pp index 9bf14b4602..52dbcf6a0f 100644 --- a/modules/openstack_project/manifests/afsfs.pp +++ b/modules/openstack_project/manifests/afsfs.pp @@ -15,6 +15,6 @@ class openstack_project::afsfs ( ip => '23.253.200.228', }, ], - require => Class['Openstack_project::Server'], + require => Class['Openstack_project::Template'], } }