From 8cba3645ef82fc8969affa4970d962e3848b5bff Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Nov 20 2014 19:57:53 +0000
Subject: Update RHEL Registration


---

diff --git a/0010-Update-RHEL-Registration.patch b/0010-Update-RHEL-Registration.patch
new file mode 100644
index 0000000..8cce872
--- /dev/null
+++ b/0010-Update-RHEL-Registration.patch
@@ -0,0 +1,24 @@
+From 03fc6349b1e5f715b05c67976a7b33f4703a89b4 Mon Sep 17 00:00:00 2001
+From: Ryan Brady <rbrady@redhat.com>
+Date: Wed, 19 Nov 2014 17:41:14 -0500
+Subject: [PATCH] Update RHEL Registration
+
+This patch updates the 00-rhel-registration script to not
+not fail a stack when metadata isn't found.
+
+Change-Id: Ie305fed79e4baadf1a03c4a3d06a23cf36e92f77
+---
+ .../rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration  | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration b/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
+index 631f0c6..f85569f 100755
+--- a/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
++++ b/elements/rhel-common/os-refresh-config/pre-configure.d/06-rhel-registration
+@@ -115,5 +115,5 @@ case "${REG_METHOD:-}" in
+         ;;
+     *)
+         echo "WARNING: only 'portal' and 'satellite' are valid values for REG_METHOD."
+-        exit 1
++        exit 0
+ esac
diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index d737b25..2fafd27 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -1,7 +1,7 @@
 Name:		diskimage-builder
 Summary:	Image building tools for OpenStack
 Version:	0.1.34
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://launchpad.net/diskimage-builder
@@ -16,6 +16,7 @@ Patch0006: 0006-Simplify-Dracut-cmdline-script.patch
 Patch0007: 0007-Use-binary-deps.d-for-dracut-ramdisks.patch
 Patch0008: 0008-Remove-duplicate-binary-deps-from-dracut-ramdisk.patch
 Patch0009: 0009-Enable-RHEL-Registration.patch
+Patch0010: 0010-Update-RHEL-Registration.patch
 
 BuildArch: noarch
 BuildRequires: python2-devel
@@ -43,6 +44,7 @@ Requires: dib-utils
 %patch0007 -p1
 %patch0008 -p1
 %patch0009 -p1
+%patch0010 -p1
 
 %build
 %{__python} setup.py build
@@ -85,6 +87,9 @@ Components of TripleO that are responsible for building disk images.
 %{_datadir}/%{name}/elements
 
 %changelog
+* Thu Nov 20 2014 Ben Nemec <bnemec@redhat.com> 0.1.34-12
+- Update RHEL Registration
+
 * Tue Nov 18 2014 Ben Nemec <bnemec@redhat.com> 0.1.34-11
 - Enable RHEL Registration