From 4ab9f79f69dff33343c9c447beb81146ae9f8534 Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Thu, 26 Mar 2015 16:13:42 -0500
Subject: [PATCH] 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
---
 elements/centos-cr/README.rst                      | 4 ++++
 elements/centos-cr/pre-install.d/00-enable-cr-repo | 9 +++++++++
 scripts/instack-build-images                       | 3 ++-
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 elements/centos-cr/README.rst
 create mode 100755 elements/centos-cr/pre-install.d/00-enable-cr-repo

diff --git a/elements/centos-cr/README.rst b/elements/centos-cr/README.rst
new file mode 100644
index 000000000..2b7cedf62
--- /dev/null
+++ b/elements/centos-cr/README.rst
@@ -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
diff --git a/elements/centos-cr/pre-install.d/00-enable-cr-repo b/elements/centos-cr/pre-install.d/00-enable-cr-repo
new file mode 100755
index 000000000..ac3e9a029
--- /dev/null
+++ b/elements/centos-cr/pre-install.d/00-enable-cr-repo
@@ -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
diff --git a/scripts/instack-build-images b/scripts/instack-build-images
index 6f983dee6..3a4eaf74e 100755
--- a/scripts/instack-build-images
+++ b/scripts/instack-build-images
@@ -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}