[openstack-packstack/f21] Add 0001-Fix-NetworkManager-facter-error.patch

[Gael Chamoulaud]

commit 0cdf89e2b4b3c41f2680655905ad22e4831ab698
Author: Gael Chamoulaud <gchamoul at redhat.com>
Date:   Mon Nov 24 17:54:37 2014 +0100

    Add 0001-Fix-NetworkManager-facter-error.patch
    
    Signed-off-by: Gael Chamoulaud <gchamoul at redhat.com>

 0001-Fix-NetworkManager-facter-error.patch |   39 ++++++++++++++++++++++++++++
 openstack-packstack.spec                   |    9 +++++-
 2 files changed, 47 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-NetworkManager-facter-error.patch b/0001-Fix-NetworkManager-facter-error.patch
new file mode 100644
index 0000000..dbe2934
--- /dev/null
+++ b/0001-Fix-NetworkManager-facter-error.patch
@@ -0,0 +1,39 @@
+From 8489382d0f27c020f96bce2d043bc34c0cf8ce98 Mon Sep 17 00:00:00 2001
+From: Ivan Chavero <ichavero at redhat.com>
+Date: Tue, 30 Sep 2014 15:04:14 -0600
+Subject: [PATCH] Fix NetworkManager facter error
+
+When puppet is run with NetworkManager disabled it gets an error
+from facter that is cascaded to packstack causing a failure.
+
+Facter (>= 2.1.0) ships a new structured facts called dhcp_servers which
+returns a hash of DHCP Server addresses. That fact requires NetworkManager
+running (https://tickets.puppetlabs.com/browse/FACT-697).
+
+Fixes: rhbz#1116403
+
+Change-Id: Ied08f797dd9ea5039e3d03d42eb172c77ab4113a
+(cherry picked from commit 35c9d3c392f71840e56aac57bb87b768170475f9)
+---
+ packstack/modules/puppet.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/packstack/modules/puppet.py b/packstack/modules/puppet.py
+index 01f29f8..bbb0b22 100644
+--- a/packstack/modules/puppet.py
++++ b/packstack/modules/puppet.py
+@@ -27,7 +27,10 @@ re_ignore = re.compile(
+     'Could not prefetch database_grant provider.*?\\.my\\.cnf|'
+     # Swift Puppet module tries to install swift-plugin-s3, there is no such
+     # package on RHEL, fixed in the upstream puppet module
+-    'yum.*?install swift-plugin-s3'
++    'yum.*?install swift-plugin-s3|'
++    # facter gives a weird NM error when it's disabled, due to
++    # https://tickets.puppetlabs.com/browse/FACT-697
++    'NetworkManager is not running'
+ )
+ re_notice = re.compile(r"notice: .*Notify\[packstack_info\]"
+                          "\/message: defined \'message\' as "
+-- 
+2.1.0
+
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 5797a26..a89029b 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -6,7 +6,7 @@
 
 Name:           openstack-packstack
 Version:        2014.1.1
-Release:        0.31.dev%{git_revno}%{?dist}
+Release:        0.31.1.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -16,6 +16,7 @@ URL:            https://github.com/stackforge/packstack
 Source0:        http://mmagr.fedorapeople.org/downloads/packstack/packstack-%{version}dev%{git_revno}.tar.gz
 
 Patch0:         enable-epel.patch
+Patch1:         0001-Fix-NetworkManager-facter-error.patch
 
 BuildArch:      noarch
 
@@ -69,6 +70,9 @@ This package contains documentation files for Packstack.
 %patch0 -p1
 %endif
 
+# Applying patch 0001-Fix-NetworkManager-facter-error.patch
+%patch1 -p1
+
 # Sanitizing a lot of the files in the puppet modules
 find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} +
 find packstack/puppet/modules \( -name "*.py" -o -name "*.rb" -o -name "*.pl" \) -exec sed -i '/^#!/{d;q}' {} + -exec chmod -x {} +
@@ -141,6 +145,9 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 # changelog --------------------------------------------------------------------
 
 %changelog
+* Mon Nov 24 2014 Gael Chamoulaud <gchamoul at redhat.com> - 2014.1.1-0.31.1.dev1266
+- Add 0001-Fix-NetworkManager-facter-error.patch
+
 * Fri Nov 21 2014 Iván Chavero <ichavero at redhat.com> - 2014.1.1-0.31.dev1266
 - [MariaDB] Fixed typo
 - [Swift] Fix swift loopback creation