[openstack-packstack] Switched openstack-packstack to use openstack-puppet-modules

[Martin Mágr]

commit 27ff41995ac191f0e42066938b3a19aae2fc432d
Author: Martin Magr <mmagr at redhat.com>
Date:   Wed Feb 12 14:51:52 2014 +0100

    Switched openstack-packstack to use openstack-puppet-modules

 .gitignore               |    1 +
 openstack-packstack.spec |   96 +++++++++++++++++++++++++++++++--------------
 sources                  |    2 +-
 3 files changed, 68 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7fc876c..08a6dc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /packstack-2013.2.1dev934.tar.gz
 /packstack-2013.2.1dev936.tar.gz
 /packstack-2013.2.1dev956.tar.gz
+/packstack-2014.1.1dev991.tar.gz
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 78af6fa..0779ee2 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 991
 
-%global git_revno 956
+
+# openstack-packstack ----------------------------------------------------------
 
 Name:           openstack-packstack
-Version:        2013.2.1
-#Release:       1%{?dist}
-Release:        0.30.dev%{git_revno}%{?dist}
+Version:        2014.1.1
+Release:        0.1.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -17,31 +19,49 @@ 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}
 
 # Sanitizing a lot of the files in the puppet modules, they come from seperate upstream projects
@@ -56,50 +76,66 @@ 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}
 
 # 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/
 
+%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
+* Mon Feb 24 2014 Martin Mágr <mmagr at redhat.com> - 2014.1.1-0.1.dev991
+- Added openstack-packstack-doc subpackage
+- Added openstack-packstack-puppet subpackage (rhbz#1063980)
+- Removed packstack-puppet-modules subpackage (rhbz#1063980)
+- Added openstack-puppet-modules require (rhbz#1063980)
+
 * Tue Feb 04 2014 Matthias Runge <mrunge at redhat.com> - 2013.2.1-0.30.dev956
 - fix build related issue on el7
 - fix bogus date in changelogs
diff --git a/sources b/sources
index 9c0c52d..18582f7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-18e3f359a31a69c14ed7bf875667312b  packstack-2013.2.1dev956.tar.gz
+2fe12f6fd4ad62b46cd2a73162cfba6d  packstack-2014.1.1dev991.tar.gz