From 0c43225fac7af85b47cdbbfe6554aa116e29571d Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Fri, 21 Apr 2017 21:07:56 +0200
Subject: [PATCH] Move afs client to openstack_project::server

single_use_slave does not enable afs so we can move the client class
over to openstack_project::server. We don't remove the afs parameter
from the template class yet because it is needed for the iptables class.

Change-Id: Ibb099d5ffbf40501c27ba5caedd1e94e5ead6827
---
 modules/openstack_project/manifests/server.pp   | 14 +++++++++++++-
 modules/openstack_project/manifests/template.pp | 12 ------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 305391609d..60bdb849f9 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -186,6 +186,19 @@ class openstack_project::server (
     }
   }
 
+  if $afs {
+    class { 'openafs::client':
+      cell         => 'openstack.org',
+      realm        => 'OPENSTACK.ORG',
+      admin_server => 'kdc.openstack.org',
+      cache_size   => $afs_cache_size,
+      kdcs         => [
+        'kdc01.openstack.org',
+        'kdc02.openstack.org',
+      ],
+    }
+  }
+
   class { 'openstack_project::automatic_upgrades':
     origins => ["Puppetlabs:${lsbdistcodename}"],
   }
@@ -269,7 +282,6 @@ class openstack_project::server (
     ca_server                 => $ca_server,
     puppetmaster_server       => $puppetmaster_server,
     afs                       => $afs,
-    afs_cache_size            => $afs_cache_size,
     sysadmins                 => $sysadmins,
   }
 
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index a213c71e46..812e7f3ed6 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -14,7 +14,6 @@ class openstack_project::template (
   $certname                  = $::fqdn,
   $ca_server                 = undef,
   $afs                       = false,
-  $afs_cache_size            = 500000,
   $puppetmaster_server       = 'puppetmaster.openstack.org',
   $sysadmins                 = [],
   $permit_root_login         = 'no',
@@ -26,17 +25,6 @@ class openstack_project::template (
   if ( $afs ) {
     $all_udp = concat(
       $iptables_public_udp_ports, [7001])
-
-    class { 'openafs::client':
-      cell         => 'openstack.org',
-      realm        => 'OPENSTACK.ORG',
-      admin_server => 'kdc.openstack.org',
-      cache_size   => $afs_cache_size,
-      kdcs         => [
-        'kdc01.openstack.org',
-        'kdc02.openstack.org',
-      ],
-    }
   } else {
     $all_udp = $iptables_public_udp_ports
   }