From fdd6f641ec253cdd39713e5866950428e390bfa4 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Wed, 9 Mar 2016 14:59:46 +1100
Subject: [PATCH] Use CI built RPMs for CentOS7

There is no official RPM packages for AFS on CentOS7 at this point.
Openstack builds some for us with
I53e8267b2a0fc31589dd3a1f3e3f3a86175a2e15; modify the installation to
point to this repo.

I have tested this locally on a devstack-centos7 node against the
built rpm repo [1].  The puppet run took a long-ish ~5 minutes as it
has to build the kernel modules via dkms.  However, after this, I
could access the afs mount [2].

[1] https://tarballs.openstack.org/package-afs-centos7/
[2] http://paste.openstack.org/show/490323/

Change-Id: Ib7bc8892cd0e94cc71df1988c48cf94435216c8f
Depends-On: I53e8267b2a0fc31589dd3a1f3e3f3a86175a2e15
---
 files/openafs-rhel.repo | 12 ------------
 files/openafs.repo      |  5 +++++
 manifests/client.pp     | 23 +++++++++++------------
 3 files changed, 16 insertions(+), 24 deletions(-)
 delete mode 100644 files/openafs-rhel.repo
 create mode 100644 files/openafs.repo

diff --git a/files/openafs-rhel.repo b/files/openafs-rhel.repo
deleted file mode 100644
index c7dd9c7..0000000
--- a/files/openafs-rhel.repo
+++ /dev/null
@@ -1,12 +0,0 @@
-[openafs]
-name=OpenAFS 1.6.11 for RHEL $releasever - $basearch
-baseurl=http://dl.openafs.org/dl/openafs/1.6.11/rhel$releasever/$basearch/
-enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-OPENAFS
-gpgcheck=1
-
-[openafs-source]
-name=OpenAFS 1.6.11 for RHEL $releasever - Source
-baseurl=http://dl.openafs.org/dl/openafs/1.6.11/
-enabled=0
-gpgcheck=0
diff --git a/files/openafs.repo b/files/openafs.repo
new file mode 100644
index 0000000..f21cb3c
--- /dev/null
+++ b/files/openafs.repo
@@ -0,0 +1,5 @@
+[openafs]
+name=OpenAFS Openstack CI build
+baseurl=https://tarballs.openstack.org/package-afs-centos7
+enabled=1
+gpgcheck=0
diff --git a/manifests/client.pp b/manifests/client.pp
index 36b3443..40031b0 100644
--- a/manifests/client.pp
+++ b/manifests/client.pp
@@ -25,6 +25,15 @@ class openafs::client (
   }
 
   if ($::osfamily == 'RedHat') {
+
+    # There is no official release of AFS for RHEL/CentOS7 at this
+    # stage.  We are pointing this to RPMs we have build in a job at
+    # tarballs.openstack.org, and we only build for 7 ATM
+    #  TODO: fedora
+    if versioncmp($::operatingsystemmajrelease, '7') != 0 {
+      fail('We only support Centos7 builds at this time')
+    }
+
     $openafs_path = '/usr/vice/etc'
 
     if ! defined(Package['kernel-devel']) {
@@ -70,20 +79,10 @@ class openafs::client (
       ],
     }
 
-    file { '/etc/pki/rpm-gpg/RPM-GPG-KEY-OPENAFS':
+    file { '/etc/yum.repos.d/openafs.repo':
       ensure  => present,
       replace => true,
-      source  => 'puppet:///modules/openafs/RPM-GPG-KEY-OPENAFS',
-      before  => [
-        Package['openafs-client'],
-        Package['openafs-krb5'],
-      ],
-    }
-
-    file { '/etc/yum.repos.d/openafs-rhel.repo':
-      ensure  => present,
-      replace => true,
-      source  => 'puppet:///modules/openafs/openafs-rhel.repo',
+      source  => 'puppet:///modules/openafs/openafs.repo',
       before  => [
         Package['openafs-client'],
         Package['openafs-krb5'],