From d604c8c3a6978c84a3bee9c49934dfacb7a4208b Mon Sep 17 00:00:00 2001
From: Justin Phelps <linuturk@onitato.com>
Date: Tue, 15 Mar 2016 16:27:33 -0500
Subject: [PATCH] Remove trailing whitespace from the galaxy init Jinja2
 template. Default a description.

---
 lib/ansible/cli/galaxy.py                    |  1 +
 lib/ansible/galaxy/data/metadata_template.j2 | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py
index 17f06409bb..9aed9d742d 100644
--- a/lib/ansible/cli/galaxy.py
+++ b/lib/ansible/cli/galaxy.py
@@ -251,6 +251,7 @@ class GalaxyCLI(CLI):
 
                 inject = dict(
                     author = 'your name',
+                    description = 'your description',
                     company = 'your company (optional)',
                     license = 'license (GPLv2, CC-BY, etc)',
                     issue_tracker_url = 'http://example.com/issue/tracker',
diff --git a/lib/ansible/galaxy/data/metadata_template.j2 b/lib/ansible/galaxy/data/metadata_template.j2
index 1054c64bdf..2b9228f39f 100644
--- a/lib/ansible/galaxy/data/metadata_template.j2
+++ b/lib/ansible/galaxy/data/metadata_template.j2
@@ -1,12 +1,12 @@
 galaxy_info:
   author: {{ author }}
-  description: {{description}}
+  description: {{ description }}
   company: {{ company }}
-  
+
   # If the issue tracker for your role is not on github, uncomment the
   # next line and provide a value
   # issue_tracker_url: {{ issue_tracker_url }}
-  
+
   # Some suggested licenses:
   # - BSD (default)
   # - MIT
@@ -15,7 +15,7 @@ galaxy_info:
   # - Apache
   # - CC-BY
   license: {{ license }}
-  
+
   min_ansible_version: {{ min_ansible_version }}
 
   # Optionally specify the branch Galaxy will use when accessing the GitHub
@@ -25,7 +25,7 @@ galaxy_info:
   # branch will be accepted. Otherwise, in all cases, the repo's default branch
   # (usually master) will be used.
   #github_branch:
-  
+
   #
   # Below are all platforms currently available. Just uncomment
   # the ones that apply to your role. If you don't see your
@@ -38,9 +38,9 @@ galaxy_info:
   #  - all
     {%- for version in versions %}
   #  - {{ version }}
-    {%- endfor %}
+    {%- endfor -%}
   {%- endfor %}
-  
+
   galaxy_tags: []
     # List tags for your role here, one per line. A tag is
     # a keyword that describes and categorizes the role.