[openstack-packstack/f20] Updated to packstack-2013.2.1dev1009.tar.gz

Fri Apr 4 16:02:18 UTC 2014

commit 71d289f608075507d59160d6a3f3236c62dc3505
Author: Martin Magr <mmagr at redhat.com>
Date:   Fri Apr 4 18:01:55 2014 +0200

    Updated to packstack-2013.2.1dev1009.tar.gz

 .gitignore               |    1 +
 openstack-packstack.spec |  107 +++++++++++++++++++++++++++++++---------------
 sources                  |    2 +-
 3 files changed, 75 insertions(+), 35 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 0a096c1..9c8e3ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
 /packstack-2013.2.1dev987.tar.gz
 /packstack-2013.2.1dev988.tar.gz
 /packstack-2013.2.1dev989.tar.gz
+/packstack-2013.2.1dev1009.tar.gz
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index b816fc1..1e3b6c9 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -1,10 +1,12 @@
+%global with_doc %{!?_without_doc:1}%{?_without_doc:0}
+%global git_revno 1009
 
-%global git_revno 989
+
+# openstack-packstack ----------------------------------------------------------
 
 Name:           openstack-packstack
 Version:        2013.2.1
-#Release:       1%{?dist}
-Release:        0.34.dev%{git_revno}%{?dist}
+Release:        0.35.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -12,43 +14,56 @@ License:        ASL 2.0 and GPLv2
 URL:            https://github.com/stackforge/packstack
 # Tarball is created by bin/release.sh
 Source0:        http://mmagr.fedorapeople.org/downloads/packstack/packstack-%{version}dev%{git_revno}.tar.gz
-Patch0:         Mariadb-patch.patch
-Patch1:         Apache-patch.patch
 
 BuildArch:      noarch
 
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
-%if 0%{?rhel} == 6
-BuildRequires:  python-sphinx10
-%else
-BuildRequires:  python-sphinx
-%endif
 
 Requires:       openssh-clients
 Requires:       python-netaddr
+Requires:       openstack-packstack-puppet == %{version}-%{release}
+Requires:       openstack-puppet-modules
 
 %description
-Packstack is a utility that uses puppet modules to install openstack
-packstack can be used to deploy various parts of openstack on multiple
-pre installed servers over ssh. It does this by using puppet manifests to
-apply Puppet Labs modules (https://github.com/puppetlabs/)
+Packstack is a utility that uses Puppet modules to install OpenStack. Packstack
+can be used to deploy various parts of OpenStack on multiple pre installed
+servers over ssh.
+
+
+# openstack-packstack-puppet ---------------------------------------------------
+
+%package puppet
+Summary:        Packstack Puppet module
+Group:          Development/Libraries
 
+%description puppet
+Puppet module used by Packstack to install OpenStack
 
-%package -n packstack-modules-puppet
-Summary:        Set of Puppet modules for OpenStack
 
-%description -n packstack-modules-puppet
-Set of Puppet modules used by Packstack to install OpenStack
+# openstack-packstack-doc ------------------------------------------------------
+
+%if 0%{?with_doc}
+%package doc
+Summary:          Documentation for Packstack
+Group:            Documentation
+
+%if 0%{?rhel} == 6
+BuildRequires:  python-sphinx10
+%else
+BuildRequires:  python-sphinx
+%endif
+
+%description doc
+This package contains documentation files for Packstack.
+%endif
 
 
+# prep -------------------------------------------------------------------------
+
 %prep
-#%setup -n packstack-%{version}
 %setup -n packstack-%{version}dev%{git_revno}
 
-%patch0 -p1
-%patch1 -p1
-
 # Sanitizing a lot of the files in the puppet modules, they come from seperate upstream projects
 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 {} +
@@ -61,21 +76,22 @@ rm -rf %{_builddir}/puppet
 mv packstack/puppet %{_builddir}/puppet
 
 
-%build
-# puppet on fedora already has this module, using this one causes problems
-%if 0%{?fedora}
-    rm -rf %{_builddir}/puppet/modules/create_resources
-%endif
+# build ------------------------------------------------------------------------
 
+%build
 %{__python} setup.py build
 
+%if 0%{?with_doc}
 cd docs
 %if 0%{?rhel} == 6
 make man SPHINXBUILD=sphinx-1.0-build
 %else
 make man
 %endif
+%endif
+
 
+# install ----------------------------------------------------------------------
 
 %install
 %{__python} setup.py install --skip-build --root %{buildroot}
@@ -83,28 +99,51 @@ make man
 # Delete tests
 rm -fr %{buildroot}%{python_sitelib}/tests
 
-mkdir -p %{buildroot}/%{_datadir}/packstack/
-mv %{_builddir}/puppet %{buildroot}/%{python_sitelib}/packstack/puppet
-cp -r %{buildroot}/%{python_sitelib}/packstack/puppet/modules  %{buildroot}/%{_datadir}/packstack/modules
+# Install Puppet module
+mkdir -p %{buildroot}/%{_datadir}/openstack-puppet/modules
+cp -r %{_builddir}/puppet/modules/packstack  %{buildroot}/%{_datadir}/openstack-puppet/modules/
 
+# Move Puppet manifest templates back to original place
+mkdir -p %{buildroot}/%{python_sitelib}/packstack/puppet
+mv %{_builddir}/puppet/templates %{buildroot}/%{python_sitelib}/packstack/puppet/
+
+%if 0%{?with_doc}
 mkdir -p %{buildroot}%{_mandir}/man1
 install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
+%endif
 
 
+# files ------------------------------------------------------------------------
+
 %files
 %doc LICENSE
 %{_bindir}/packstack
 %{python_sitelib}/packstack
 %{python_sitelib}/packstack-%{version}*.egg-info
-%{_mandir}/man1/packstack.1.gz
 
-
-%files -n packstack-modules-puppet
+%files puppet
 %defattr(644,root,root,755)
-%{_datadir}/packstack/modules/
+%{_datadir}/openstack-puppet/modules/packstack
+
+%if 0%{?with_doc}
+%files doc
+%{_mandir}/man1/packstack.1.gz
+%endif
 
 
+# changelog --------------------------------------------------------------------
+
 %changelog
+* Fri Apr 04 2014 Martin Mágr <mmagr at redhat.com> - 2013.2.1-0.35.dev1009
+- Use openstack-puppet-modules (rhbz#1063982)
+- Fixed Swift installation (rhbz#1072070, rhbz#1072099)
+- Added support for VMWare vCenter (rhbz#1061372)
+- Executing --allinone now we honor the default values (rhbz#1056689)
+- Ensure ovs_neutron_plugin.ini has correct ownership (rhbz#1080438)
+- Fixed race condition for keystone.log (rhbz#1071674)
+- Disable provisioning for multihost installations (rhbz#bug1080369)
+- Enable DHCP ports on neutron-dhcp-agent hosts (rhbz#999695)
+
 * Fri Mar 07 2014 Martin Mágr <mmagr at redhat.com> - 2013.2.1-0.34.dev989
 - Updated puppet-keystone to latest upstream stable/havana (rhbz#1073572)
 
diff --git a/sources b/sources
index 58de1c8..cf710be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a105936b08a0e420ae6054ecc5d1975  packstack-2013.2.1dev989.tar.gz
+c50b76e0d4506f386d7721bd955cb390  packstack-2013.2.1dev1009.tar.gz
