[openstack-packstack/el6-icehouse] Fixes puppet-remote installation
Ivan Chavero
ichavero at fedoraproject.org
Mon Aug 18 23:23:28 UTC 2014
commit 112de42462b20f98006e3a8d6b653428f6828df1
Author: Ivan Chavero <ichavero at redhat.com>
Date: Mon Aug 18 16:57:40 2014 -0600
Fixes puppet-remote installation
Resolves: rhbz#112821
openstack-packstack.spec | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index c1b3911..d6a7e71 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -6,7 +6,7 @@
Name: openstack-packstack
Version: 2014.1.1
-Release: 0.27.dev%{git_revno}%{?dist}
+Release: 0.28.dev%{git_revno}%{?dist}
Summary: Openstack Install Utility
Group: Applications/System
@@ -67,7 +67,7 @@ This package contains documentation files for Packstack.
%setup -n packstack-%{version}dev%{git_revno}
%patch0 -p1
-# Sanitizing a lot of the files in the puppet modules, they come from seperate upstream projects
+# 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 {} +
find packstack/puppet/modules \( -name "*.sh" \) -exec sed -i 's/^#!.*/#!\/bin\/bash/g' {} + -exec chmod +x {} +
@@ -105,6 +105,7 @@ rm -fr %{buildroot}%{python_sitelib}/tests
# Install Puppet module
mkdir -p %{buildroot}/%{_datadir}/openstack-puppet/modules
cp -r %{_builddir}/puppet/modules/packstack %{buildroot}/%{_datadir}/openstack-puppet/modules/
+cp -r %{_builddir}/puppet/modules/remote %{buildroot}/%{_datadir}/openstack-puppet/modules/
# Move Puppet manifest templates back to original place
mkdir -p %{buildroot}/%{python_sitelib}/packstack/puppet
@@ -127,6 +128,7 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
%files puppet
%defattr(644,root,root,755)
%{_datadir}/openstack-puppet/modules/packstack
+%{_datadir}/openstack-puppet/modules/remote
%if 0%{?with_doc}
%files doc
@@ -137,6 +139,9 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
# changelog --------------------------------------------------------------------
%changelog
+* Mon Aug 18 2014 Iván Chavero <ichavero at redhat.com> - 2014.1.1-0.28.dev1238
+- Fixed installation of puppet-remote module (rhbz#1128212)
+
* Fri Aug 15 2014 Iván Chavero <ichavero at redhat.com> - 2014.1.1-0.27.dev1238
- [Nova] Added FW rules for live migration (rhbz#1117524)
- [Nova] Add live migration support and firewall rules (rhbz#1122457, rhbz#1122703, rhbz#1117524)
More information about the scm-commits
mailing list