Merge pull request #286 from tbielawa/PkgReviewRetagFixes

Pkg review retag fixes

CHANGELOG.md

@@ -0,0 +1,42 @@
+Ansible Changes By Release
+==========================
+
+0.4 "Unchained" ------- in progress
+
+* See the CHANGELOG.md file on the devel branch for a summary
+
+0.3 "Baluchitherium" -- April 23, 2012
+
+* Packaging for Debian, Gentoo, and Arch
+* Improvements to the apt and yum modules
+* A virt module
+* SELinux support for the file module
+* Ability to use facts from other systems in templates (aka exported
+resources like support)
+* Built in Ansible facts so you don't need ohai, facter, or Ruby
+* tempdir selections that work with noexec mounted /tmp
+* templates happen locally, not remotely, so no dependency on
+python-jinja2 for remote computers
+* advanced inventory format in YAML allows more control over variables
+per host and per group
+* variables in playbooks can be structured/nested versus just a flat namespace
+* manpage upgrades (docs)
+* various bugfixes
+* can specify a default --user for playbooks rather than specifying it
+in the playbook file
+* able to specify ansible port in ansible host file (see docs)
+* refactored Inventory API to make it easier to write scripts using Ansible
+* looping capability for playbooks (with_items)
+* support for using sudo with a password
+* module arguments can be unicode
+* A local connection type, --connection=local,  for use with cron or
+in kickstarts
+* better module debugging with -D
+* fetch module for pulling in files from remote hosts
+* command task supports creates=foo for idempotent semantics, won't
+run if file foo already exists 
+
+0.0.2 and 0.0.1
+
+* Initial stages of project
+

MANIFEST.in

@@ -1,4 +1,4 @@
-include README.md packaging/rpm/ansible.spec
+include README.md packaging/rpm/ansible.spec COPYING
 include examples/hosts
 include packaging/distutils/setup.py
 recursive-include docs *

README.md

@@ -24,6 +24,15 @@ Get Involved
    * [ansible-project mailing list](http://groups.google.com/group/ansible-project)
    * irc.freenode.net: #ansible
 
+Branch Info
+===========
+
+   * The master branch corresponds to release 0.3 "Baluchitherium".
+   * Bug fixes WILL be periodically made to the master branch.
+   * The devel branch corresponds to release 0.4 "Unchained".
+   * Note: sudo support works much better in 0.4/devel, consider trying it.
+   * See CHANGELOG.md for release notes to track each release.
+
 Patch Instructions
 ==================
 

VERSION

@@ -1 +1 @@
-0.3
+0.3.1

docs/man/man1/ansible-playbook.1

@@ -2,12 +2,12 @@
 .\"     Title: ansible-playbook
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 04/17/2012
+.\"      Date: 05/01/2012
 .\"    Manual: System administration commands
-.\"    Source: Ansible 0.0.2
+.\"    Source: Ansible 0.3.1
 .\"  Language: English
 .\"
-.TH "ANSIBLE\-PLAYBOOK" "1" "04/17/2012" "Ansible 0\&.0\&.2" "System administration commands"
+.TH "ANSIBLE\-PLAYBOOK" "1" "05/01/2012" "Ansible 0\&.3\&.1" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,10 +42,11 @@ ansible\-playbook <filename\&.yml> \&... [options]
 The names of one or more YAML format files to run as ansible playbooks\&.
 .RE
 .SH "OPTIONS"
-.sp
+.PP
 \fB\-D\fR, \fB\-\-debug\fR
-.sp
+.RS 4
 Print any messages the remote module sends to standard error to the console
+.RE
 .PP
 \fB\-i\fR \fIPATH\fR, \fB\-\-inventory=\fR\fIPATH\fR
 .RS 4

docs/man/man1/ansible-playbook.1.asciidoc.in

@@ -34,7 +34,7 @@ The names of one or more YAML format files to run as ansible playbooks.
 OPTIONS
 -------
 
-*-D*, *--debug*          
+*-D*, *--debug*::
 
 Print any messages the remote module sends to standard error to the console
 

docs/man/man1/ansible.1

@@ -2,12 +2,12 @@
 .\"     Title: ansible
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 04/17/2012
+.\"      Date: 05/01/2012
 .\"    Manual: System administration commands
-.\"    Source: Ansible 0.0.2
+.\"    Source: Ansible 0.3.1
 .\"  Language: English
 .\"
-.TH "ANSIBLE" "1" "04/17/2012" "Ansible 0\&.0\&.2" "System administration commands"
+.TH "ANSIBLE" "1" "05/01/2012" "Ansible 0\&.3\&.1" "System administration commands"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

lib/ansible/__init__.py

@@ -14,5 +14,5 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-__version__ = '0.3'
+__version__ = '0.3.1'
 __author__ = 'Michael DeHaan'

lib/ansible/playbook.py

@@ -154,7 +154,7 @@ class PlayBook(object):
                 include_vars[k] = v
         inject_vars = play_vars.copy()
         inject_vars.update(include_vars)
-        included = utils.template_from_file(path, inject_vars)
+        included = utils.template_from_file(path, inject_vars, SETUP_CACHE)
         included = utils.parse_yaml(included)
         for x in included:
             if len(include_vars):
@@ -168,7 +168,7 @@ class PlayBook(object):
 
         path = utils.path_dwim(dirname, handler['include'])
         inject_vars = self._get_vars(play, dirname)
-        included = utils.template_from_file(path, inject_vars)
+        included = utils.template_from_file(path, inject_vars, SETUP_CACHE)
         included = utils.parse_yaml(included)
         for x in included:
             new_handlers.append(x)

lib/ansible/utils.py

@@ -249,10 +249,10 @@ def template(text, vars, setup_cache):
 def double_template(text, vars, setup_cache):
     return template(template(text, vars, setup_cache), vars, setup_cache)
 
-def template_from_file(path, vars):
+def template_from_file(path, vars, setup_cache):
     ''' run a file through the templating engine '''
     data = file(path).read()
-    return template(data, vars)
+    return template(data, vars, setup_cache)
 
 def parse_yaml(data):
     return yaml.load(data)

packaging/rpm/ansible.spec

@@ -1,15 +1,10 @@
-%if 0%{?rhel} <= 5
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-%endif
-
 Name: ansible
 Release: 1%{?dist}
 Summary: Minimal SSH command and control
-Version: 0.3
+Version: 0.3.1
 
 Group: Development/Libraries
-License: GPLv3
+License: GPLv3+
 Source0: https://github.com/downloads/ansible/ansible/%{name}-%{version}.tar.gz
 Url: http://ansible.github.com
 
@@ -21,14 +16,12 @@ Requires: python-paramiko
 Requires: python-jinja2
 
 %description
-
 Ansible is a radically simple model-driven configuration management,
 multi-node deployment, and remote task execution system. Ansible works
 over SSH and does not require any software or daemons to be installed
 on remote nodes. Extension modules can be written in any language and
 are transferred to managed machines automatically.
 
-
 %prep
 %setup -q
 
@@ -44,21 +37,19 @@ cp -v docs/man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/ansible
 cp -v library/* $RPM_BUILD_ROOT/%{_datadir}/ansible/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root)
 %{python_sitelib}/ansible*
 %{_bindir}/ansible*
 %{_datadir}/ansible
 %config(noreplace) %{_sysconfdir}/ansible
-%doc README.md PKG-INFO
+%doc README.md PKG-INFO COPYING
 %doc %{_mandir}/man1/ansible*
 
-
 %changelog
-* Mon Apr 23 2012 Michael DeHaan <mdehaan@redhat.com> - 0.3-1
+* Tue May  1 2012 Tim Bielawa <tbielawa@redhat.com> - 0.3.1-1
+- Release of 0.3.1. Mostly packaging related changes.
+
+* Mon Apr 23 2012 Michael DeHaan <michael.dehaan@gmail.com> - 0.3-1
 - Release of 0.3
 
 * Tue Apr  3 2012 John Eckersberg <jeckersb@redhat.com> - 0.0.2-1

setup.py

@@ -17,7 +17,7 @@ setup(name='ansible',
       author=__author__,
       author_email='michael.dehaan@gmail.com',
       url='http://ansible.github.com/',
-      license='GPLv3',
+      license='GPLv3+',
       install_requires=['paramiko', 'jinja2', "PyYAML"],
       package_dir={ 'ansible': 'lib/ansible' },
       packages=[