From 4fe1b9e0c5b9c14424b366c4bae929f16578c429 Mon Sep 17 00:00:00 2001
From: Jonathan Lent <jlent@stanford.edu>
Date: Fri, 24 Jul 2015 07:38:24 -0700
Subject: [PATCH] Readying for release 004.050

---
 NEWS                             |  2 +-
 files/rpm/stanford-test-EL5.repo | 19 +++++++++++++++++++
 files/rpm/stanford-test-EL6.repo | 19 +++++++++++++++++++
 files/rpm/stanford-test-EL7.repo | 19 +++++++++++++++++++
 manifests/rpm.pp                 |  7 +------
 5 files changed, 59 insertions(+), 7 deletions(-)
 create mode 100644 files/rpm/stanford-test-EL5.repo
 create mode 100644 files/rpm/stanford-test-EL6.repo
 create mode 100644 files/rpm/stanford-test-EL7.repo

diff --git a/NEWS b/NEWS
index 521c5c9..7018c42 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-UNLREASED (2015-07024)
+release/004.050 (2015-07-24)
 
     [rpm] Making available openafs-1.6.{7,8}-EL{5,6,7}.repo files 
     pointing to yum.stanford.edu. Also edited rpm.pp to reflect that
diff --git a/files/rpm/stanford-test-EL5.repo b/files/rpm/stanford-test-EL5.repo
new file mode 100644
index 0000000..9a2a689
--- /dev/null
+++ b/files/rpm/stanford-test-EL5.repo
@@ -0,0 +1,19 @@
+# Name: Stanford test RPMs for EL
+# URL: http://yum.stanford.edu/
+
+[stanford-test]
+name = Stanford test RPMs for EL$releasever $basearch
+baseurl = http://yum.stanford.edu/mrepo/stanford-test-EL5-$basearch/RPMS.updates
+enabled = 1
+protect = 0
+gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY
+gpgcheck = 1
+
+[stanford-test-noarch]
+name = Stanford test RPMs for EL$releasever noarch
+baseurl = http://yum.stanford.edu/mrepo/stanford-test-EL5-noarch/RPMS.updates
+enabled = 1
+protect = 0
+gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY
+gpgcheck = 1
+
diff --git a/files/rpm/stanford-test-EL6.repo b/files/rpm/stanford-test-EL6.repo
new file mode 100644
index 0000000..a89e9c4
--- /dev/null
+++ b/files/rpm/stanford-test-EL6.repo
@@ -0,0 +1,19 @@
+# Name: Stanford test RPMs for EL
+# URL: http://yum.stanford.edu/
+
+[stanford-test]
+name = Stanford test RPMs for EL$releasever $basearch
+baseurl = http://yum.stanford.edu/mrepo/stanford-test-EL6-$basearch/RPMS.updates
+enabled = 1
+protect = 0
+gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY
+gpgcheck = 1
+
+[stanford-test-noarch]
+name = Stanford test RPMs for EL$releasever noarch
+baseurl = http://yum.stanford.edu/mrepo/stanford-test-EL6-noarch/RPMS.updates
+enabled = 1
+protect = 0
+gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY
+gpgcheck = 1
+
diff --git a/files/rpm/stanford-test-EL7.repo b/files/rpm/stanford-test-EL7.repo
new file mode 100644
index 0000000..3f5814f
--- /dev/null
+++ b/files/rpm/stanford-test-EL7.repo
@@ -0,0 +1,19 @@
+# Name: Stanford test RPMs for EL
+# URL: http://yum.stanford.edu/
+
+[stanford-test]
+name = Stanford test RPMs for EL$releasever $basearch
+baseurl = http://yum.stanford.edu/mrepo/stanford-test-EL7-$basearch/RPMS.updates
+enabled = 1
+protect = 0
+gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY
+gpgcheck = 1
+
+[stanford-test-noarch]
+name = Stanford test RPMs for EL$releasever noarch
+baseurl = http://yum.stanford.edu/mrepo/stanford-test-EL7-noarch/RPMS.updates
+enabled = 1
+protect = 0
+gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY
+gpgcheck = 1
+
diff --git a/manifests/rpm.pp b/manifests/rpm.pp
index 983dcbb..74deffe 100644
--- a/manifests/rpm.pp
+++ b/manifests/rpm.pp
@@ -38,9 +38,7 @@ class base::rpm {
       }
 
       # Apply to all RHEL releases
-      if ($::lsbmajdistrelease != '7') {
-        base::rpm::yumrepo { "dag-EL${::lsbmajdistrelease}.repo": }
-      }
+      base::rpm::yumrepo { "dag-EL${::lsbmajdistrelease}.repo": }
       base::rpm::yumrepo { "stanford-priv-EL${::lsbmajdistrelease}.repo": }
       base::rpm::yumrepo { "stanford-EL${::lsbmajdistrelease}.repo": }
       # puppetlabs repo now being mirrored on yum.stanford.edu
@@ -48,9 +46,6 @@ class base::rpm {
         ensure  => present,
         content => template('base/etc/yum.repos.d/puppetlabs-mirror.repo.erb'),
       }
-      # Import puppetlabs key, since it does not change per OS/Arch
-      # This is technically unneeded if you 'include puppet3', though
-      # 'puppet3' is a separate shared module
       base::rpm::import {'puppetlabs-mirror-rpmkey':
         url       => 'http://yum.stanford.edu/RPM-GPG-KEY-puppetlabs',
         signature => 'gpg-pubkey-4bd6ec30-4ff1e4fa',
-- 
GitLab