From 485cae7749eb7bb23d582afa025b6c3ab30218ce Mon Sep 17 00:00:00 2001
From: Spencer Krum <nibz@spencerkrum.com>
Date: Tue, 7 Apr 2015 13:55:42 -0700
Subject: [PATCH] Pull o_p::server invocation out of afs roles
Spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html
Story: 2000172
Change-Id: Id680dfe2e7925f138d6c34ec838f30268946836f
---
manifests/site.pp | 18 ++++++++++++++----
modules/openstack_project/manifests/afsdb.pp | 7 ++-----
modules/openstack_project/manifests/afsfs.pp | 9 +--------
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/manifests/site.pp b/manifests/site.pp
index a7ad414681..8668d92119 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -711,17 +711,27 @@ node 'kdc02.openstack.org' {
# Node-OS: trusty
node /^afsdb.*\.openstack\.org$/ {
$group = "afsdb"
- class { 'openstack_project::afsdb':
- sysadmins => hiera('sysadmins', []),
+
+ class { 'openstack_project::server':
+ iptables_public_udp_ports => [7000,7002,7003,7004,7005,7006,7007],
+ sysadmins => hiera('sysadmins', []),
+ afs => true,
}
+
+ include openstack_project::afsdb
}
# Node-OS: trusty
node /^afs.*\..*\.openstack\.org$/ {
$group = "afs"
- class { 'openstack_project::afsfs':
- sysadmins => hiera('sysadmins', []),
+
+ class { 'openstack_project::server':
+ iptables_public_udp_ports => [7000,7002,7003,7004,7005,7006,7007],
+ sysadmins => hiera('sysadmins', []),
+ afs => true,
}
+
+ include openstack_project::afsfs
}
# Node-OS: precise
diff --git a/modules/openstack_project/manifests/afsdb.pp b/modules/openstack_project/manifests/afsdb.pp
index 26c57eec1a..414bc95668 100644
--- a/modules/openstack_project/manifests/afsdb.pp
+++ b/modules/openstack_project/manifests/afsdb.pp
@@ -1,13 +1,10 @@
# AFS DB Server
class openstack_project::afsdb (
- $sysadmins = [],
) {
- class { 'openstack_project::afsfs':
- sysadmins => $sysadmins,
- }
+ class { '::openstack_project::afsfs': }
- class { 'openafs::dbserver':
+ class { '::openafs::dbserver':
require => Class['Openstack_project::Afsfs'],
}
diff --git a/modules/openstack_project/manifests/afsfs.pp b/modules/openstack_project/manifests/afsfs.pp
index f10b9f6d84..9bf14b4602 100644
--- a/modules/openstack_project/manifests/afsfs.pp
+++ b/modules/openstack_project/manifests/afsfs.pp
@@ -1,16 +1,9 @@
# AFS Fileserver/BOS
class openstack_project::afsfs (
$cell = 'openstack.org',
- $sysadmins = [],
) {
- class { 'openstack_project::server':
- iptables_public_udp_ports => [7000,7002,7003,7004,7005,7006,7007],
- sysadmins => $sysadmins,
- afs => true,
- }
-
- class { 'openafs::fileserver':
+ class { '::openafs::fileserver':
cell => $cell,
dbservers => [
{