openstack
/
instack-undercloud
Code Issues Proposed changes

Add element for CentOS CR repo 

lshw has been removed from epel 7 because it was included in RHEL
7.1.  Until CentOS 7.1 release, we need to pull it from the CentOS
CR repo on that platform.

Change-Id: I6b5250b86251e80e493b74fc2c1b39b5ff375cf8
This commit is contained in:
Ben Nemec 2015-03-26 16:13:42 -05:00
parent 6787f9be89
commit 4ab9f79f69
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elements/centos-cr/README.rst Normal file
View File

@ -0,0 +1,4 @@
Enable the CentOS CR Repo
Allow use of packages from the CentOS CR repository, per the instructions at
http://wiki.centos.org/AdditionalResources/Repositories/CR

9
elements/centos-cr/pre-install.d/00-enable-cr-repo Executable file
View File

@ -0,0 +1,9 @@
#!/bin/bash
set -eux
set -o pipefail
# Per http://seven.centos.org/?p=303 we need to update before we can
# enable the cr repo.
yum -y update
yum-config-manager --enable cr

3
scripts/instack-build-images
View File

@ -68,7 +68,8 @@ if [ "$NODE_DIST" = "rhel7" ]; then
elif [ "$NODE_DIST" = "centos7" ]; then
export DELOREAN_REPO_URL=$DELOREAN_EL7_REPO_URL
# SELinux permissive for CentOS for now
export DIB_COMMON_ELEMENTS=selinux-permissive
# lshw has moved from EPEL to the CentOS cr repo
export DIB_COMMON_ELEMENTS="selinux-permissive centos-cr"
fi
export DEPLOY_IMAGE_ELEMENT=${DEPLOY_IMAGE_ELEMENT:-deploy-ironic}