first pass at adding havana repo for centOS/RHEL
Currently, the cookbooks attempt to install centOS/RHEL packages from epel, since no other repo is configured. epel contains folsom packages. This commit drops in the official havana repo/gpg key so at least the correct set of packages will attempt to be installed by chef. Implements: blueprint centos-rhel-for-common Change-Id: I76edc6538a71a8fb5f4242e8174aff9b3831834f
This commit is contained in:
parent
0fa1154758
commit
5d3e7237d3
@ -5,6 +5,7 @@ This file is used to list changes made in each version of cookbook-openstack-com
|
||||
## 8.0.1:
|
||||
### Bug
|
||||
* Add sleep to search_for function, so that node can be searched
|
||||
* Add CentOS/RHEL support
|
||||
|
||||
## 8.0.0:
|
||||
* Upgrading to Havana
|
||||
|
@ -78,7 +78,8 @@ default["openstack"]["apt"]["components"] = [ "precise-updates/#{node["openstack
|
||||
default["openstack"]["zypp"]["repo-key"] = "d85f9316" # 32 bit key ID
|
||||
default["openstack"]["zypp"]["uri"] = "http://download.opensuse.org/repositories/Cloud:/OpenStack:/%release%/%suse-release%/"
|
||||
|
||||
#TODO(jaypipes): Do RHEL/Fedora platform family YUM setup
|
||||
default["openstack"]["yum"]["uri"] = "http://repos.fedorapeople.org/repos/openstack/openstack-havana/epel-6"
|
||||
default["openstack"]["yum"]["repo-key"] = "https://raw.github.com/redhat-openstack/rdo-release/master/RPM-GPG-KEY-RDO-Havana"
|
||||
|
||||
# ======================== OpenStack Endpoints ================================
|
||||
#
|
||||
|
@ -11,9 +11,10 @@ recipe 'openstack-common::set_endpoints_by_interface', 'Set endpoints
|
||||
recipe 'openstack-common::logging', 'Installs/Configures common logging'
|
||||
recipe 'openstack-common::sysctl', 'Configures sysctl settings'
|
||||
|
||||
%w{ ubuntu suse }.each do |os|
|
||||
%w{ ubuntu suse redhat centos }.each do |os|
|
||||
supports os
|
||||
end
|
||||
|
||||
depends 'apt'
|
||||
depends 'database'
|
||||
depends 'yum'
|
||||
|
@ -37,6 +37,20 @@ when "debian"
|
||||
components apt_components
|
||||
end
|
||||
|
||||
when "rhel"
|
||||
|
||||
yum_key "RPM-GPG-KEY-RDO-#{node["openstack"]["release"]}" do
|
||||
url node["openstack"]["yum"]["repo-key"]
|
||||
action :add
|
||||
end
|
||||
|
||||
yum_repository "RDO-#{node["openstack"]["release"]}" do
|
||||
description "OpenStack RDO repo for #{node["openstack"]["release"]}"
|
||||
key "RPM-GPG-KEY-RDO-#{node["openstack"]["release"]}"
|
||||
url node["openstack"]["yum"]["uri"]
|
||||
enabled 1
|
||||
end
|
||||
|
||||
when "suse"
|
||||
if node["lsb"]["description"].nil?
|
||||
# Workaround for SLE11
|
||||
|
Loading…
x
Reference in New Issue
Block a user