diff --git a/NEWS b/NEWS index da1a8e4cd35ba8d5671e2978448770f60ab799f3..521c5c9d88d3a11d88cef75c290b7bcc12b933fb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +UNLREASED (2015-07024) + + [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 + EL7 hosts should get 1.6.8 by default (jlent) + release/004.049 (2015-07-22) [os] Small fix to the 'ping' capability adjustment: grep -v does not diff --git a/files/rpm/openafs-1.6.7-EL5.repo b/files/rpm/openafs-1.6.7-EL5.repo new file mode 100644 index 0000000000000000000000000000000000000000..74ad0fb9d4cf19c94d219616a5800e3c8656bec9 --- /dev/null +++ b/files/rpm/openafs-1.6.7-EL5.repo @@ -0,0 +1,9 @@ +# Name: openafs 1.6.7 repos +# URL: http://yum.stanford.edu/ +[openafs-1.6.7] +name = OpenAFS 1.6.7 packages +baseurl = http://yum.stanford.edu/mrepo/openafs-1.6.7-EL5-$basearch/RPMS.updates +enabled = 1 +protect = 0 +gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY +gpgcheck = 1 diff --git a/files/rpm/openafs-1.6.7-EL6.repo b/files/rpm/openafs-1.6.7-EL6.repo new file mode 100644 index 0000000000000000000000000000000000000000..7082b7bf9e2b50e85db133dbb413885a17ec9094 --- /dev/null +++ b/files/rpm/openafs-1.6.7-EL6.repo @@ -0,0 +1,9 @@ +# Name: openafs 1.6.7 repos +# URL: http://yum.stanford.edu/ +[openafs-1.6.7] +name = OpenAFS 1.6.7 packages +baseurl = http://yum.stanford.edu/mrepo/openafs-1.6.7-EL6-$basearch/RPMS.updates +enabled = 1 +protect = 0 +gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY +gpgcheck = 1 diff --git a/files/rpm/openafs-1.6.7-EL7.repo b/files/rpm/openafs-1.6.7-EL7.repo new file mode 100644 index 0000000000000000000000000000000000000000..d96407cc9f4eba1b6fbf0b1d1f0d1f1a501258fa --- /dev/null +++ b/files/rpm/openafs-1.6.7-EL7.repo @@ -0,0 +1,9 @@ +# Name: openafs 1.6.7 repos +# URL: http://yum.stanford.edu/ +[openafs-1.6.7] +name = OpenAFS 1.6.7 packages +baseurl = http://yum.stanford.edu/mrepo/openafs-1.6.7-EL7-$basearch/RPMS.updates +enabled = 1 +protect = 0 +gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY +gpgcheck = 1 diff --git a/files/rpm/openafs-1.6.8-EL5.repo b/files/rpm/openafs-1.6.8-EL5.repo new file mode 100644 index 0000000000000000000000000000000000000000..e1bbb4e8ee2d51315bc48ee2511385e5f955184f --- /dev/null +++ b/files/rpm/openafs-1.6.8-EL5.repo @@ -0,0 +1,9 @@ +# Name: openafs 1.6.8 repos +# URL: http://yum.stanford.edu/ +[openafs-1.6.8] +name = OpenAFS 1.6.8 packages +baseurl = http://yum.stanford.edu/mrepo/openafs-1.6.8-EL5-$basearch/RPMS.updates +enabled = 1 +protect = 0 +gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY +gpgcheck = 1 diff --git a/files/rpm/openafs-1.6.8-EL6.repo b/files/rpm/openafs-1.6.8-EL6.repo new file mode 100644 index 0000000000000000000000000000000000000000..50ccc6c31fad4a824d65734ed056bb9c1593ff4f --- /dev/null +++ b/files/rpm/openafs-1.6.8-EL6.repo @@ -0,0 +1,9 @@ +# Name: openafs 1.6.8 repos +# URL: http://yum.stanford.edu/ +[openafs-1.6.8] +name = OpenAFS 1.6.8 packages +baseurl = http://yum.stanford.edu/mrepo/openafs-1.6.8-EL6-$basearch/RPMS.updates +enabled = 1 +protect = 0 +gpgkey = http://yum.stanford.edu/STANFORD-GPG-KEY +gpgcheck = 1 diff --git a/files/rpm/openafs-1.6.8-EL7.repo b/files/rpm/openafs-1.6.8-EL7.repo new file mode 100644 index 0000000000000000000000000000000000000000..3e1167428f3169edceacb711557c4ddd525d6254 --- /dev/null +++ b/files/rpm/openafs-1.6.8-EL7.repo @@ -0,0 +1,9 @@ +# Name: openafs 1.6.8 repos +# URL: http://yum.stanford.edu/ +[openafs-1.6.8] +name = OpenAFS 1.6.8 packages +baseurl = http://yum.stanford.edu/mrepo/openafs-1.6.8-EL7-$basearch/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 0d5732c7b694c6d0f343badee3e81e7461bb5112..983dcbb0c85060c5ef4257235eb6dd951f25583d 100644 --- a/manifests/rpm.pp +++ b/manifests/rpm.pp @@ -14,6 +14,7 @@ define base::rpm::yumrepo ($source='base/rpm') { # base::rpm::openafs - provides openafs yum config class base::rpm::openafs { $openafsver = $lsbmajdistrelease ? { + '7' => '1.6.8', '4' => '1.6.2', default => '1.6.5', } @@ -23,13 +24,9 @@ class base::rpm::openafs { # rpm class. applied to every RHEL system via basenode (os module) class base::rpm { - # for now, openafs packages not available for EL7 in the typical way - if ($::lsbmajdistrelease != '7') { - include base::rpm::openafs - } - case $::osfamily { 'RedHat': { + include base::rpm::openafs $redhatPackages = [ 'yum', 'yum-utils' ] package { $redhatPackages: ensure => present }