x/packstack
Code Issues Proposed changes

Updated man page and include it in spec file

Browse Source
This commit is contained in:
Derek Higgins 2012-11-28 15:38:58 +00:00
parent 4bbd3063df
commit 82cb714192
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/conf.py
View File

@ -13,6 +13,9 @@
import sys, os import sys, os
sys.path.append('..')
from packstack import version as packstackversion
# If extensions (or modules to document with autodoc) are in another directory, # If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the # add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here. # documentation root, use os.path.abspath to make it absolute, like shown here.
@ -48,9 +51,9 @@ copyright = u'2012, Red Hat'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '2012.2.2.1pre' version = packstackversion.version_string()
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '2012.2.2.1pre' release = version
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

5
docs/packstack.rst
View File

@ -127,11 +127,6 @@ Server Prepare Configs
**CONFIG_USE_EPEL** : Install openstack from epel, If set to "n" this causes EPEL to be permanently disabled before installing openstack, i.e. you should have alternative openstack repositories in place ['y', 'n'] **CONFIG_USE_EPEL** : Install openstack from epel, If set to "n" this causes EPEL to be permanently disabled before installing openstack, i.e. you should have alternative openstack repositories in place ['y', 'n']
Puppet Config paramaters
------------------------
**CONFIG_PUPPET_REMOVEMODULES** : Causes the Puppet modules to be removed (if present), and recloned from git (NOTE : may clone a untested version) ['y', 'n']
SOURCE SOURCE
====== ======

11
spec/packstack.spec
View File

@ -1,5 +1,5 @@
%global git_revno 186 %global git_revno 188
Name: openstack-packstack Name: openstack-packstack
Version: 2012.2.1 Version: 2012.2.1
@ -14,8 +14,10 @@ Source0: https://github.com/downloads/fedora-openstack/packstack/packstac
BuildArch: noarch BuildArch: noarch
BuildRequires: make
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: python-setuptools BuildRequires: python-setuptools
BuildRequires: python-sphinx
Requires: openssh-clients Requires: openssh-clients
@ -41,14 +43,21 @@ mv packstack/puppet %{_builddir}/puppet
%{__python} setup.py build %{__python} setup.py build
cd docs
make man
%install %install
%{__python} setup.py install --skip-build --root %{buildroot} %{__python} setup.py install --skip-build --root %{buildroot}
mv %{_builddir}/puppet %{buildroot}/%{python_sitelib}/packstack/puppet mv %{_builddir}/puppet %{buildroot}/%{python_sitelib}/packstack/puppet
mkdir -p %{buildroot}%{_mandir}/man1
install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
%files %files
%{_bindir}/packstack %{_bindir}/packstack
%{python_sitelib}/packstack %{python_sitelib}/packstack
%{python_sitelib}/packstack-%{version}*.egg-info %{python_sitelib}/packstack-%{version}*.egg-info
%{_mandir}/man1/packstack.1.gz
%changelog %changelog