Merge lp:~tvansteenburgh/charm-tools/ansible-template into lp:charm-tools/1.4

[Tim Van Steenburgh]

Added ansible template for 'charm create'.

[Whit Morriss (whitmo)]

Example playbook should show all the available vars that get written by `apply_playbook` to `/etc/ansible/host_vars/localhost` (and maybe charmhelpers.contrib.ansible should document these too)

[lp:~tvansteenburgh/charm-tools/ansible-template]

336. By Marco Ceppi on 2014-07-29

[tvansteenburgh] Fixed symlinks in python charm by using relative paths so that symlinks are copied properly when the charm is moved to it's final filesystem location.

337. By Marco Ceppi on 2014-07-29

[tvansteenburgh] Ensure *.pyc files are skipped during template processing.

338. By Tim Van Steenburgh on 2014-08-28

Fix charm-proof email validation

formataddr() will put quotes around a name component that
contains special chars. We need to remove those to accurately
compare against the original maintainer string.

Also fixes tests that were broken due to new files in
charmhelpers.core

339. By Tim Van Steenburgh on 2014-09-04

Remove option to symlink hooks when creating charm

340. By Tim Van Steenburgh on 2014-09-09

More helpful comments in playbook; update tests

[Tim Van Steenburgh (tvansteenburgh)]

Per Whit's suggestion I updated the playbook comments to explicitly enumerate the available variables. Also updated tests to pass against current charmhelpers, and rebased against charmtools head.

[Charles Butler (lazypower)]

+1 LGTM

Lets get this in charm-tools and start iterating on the output templates.

review: Approve

=== modified file 'charmtools/charms.py'
--- charmtools/charms.py	2014-06-17 15:44:04 +0000
+++ charmtools/charms.py	2014-09-09 18:56:48 +0000
@@ -453,7 +453,7 @@
     for maintainer in maintainers:
         (name, address) = email.utils.parseaddr(maintainer)
         formatted = email.utils.formataddr((name, address))
-        if formatted != maintainer:
+        if formatted.replace('"', '') != maintainer:
             linter.warn(
                 'Maintainer format should be "Name <Email>", '
                 'not "%s"' % formatted)

=== modified file 'charmtools/generators/template.py'
--- charmtools/generators/template.py	2014-07-29 18:15:41 +0000
+++ charmtools/generators/template.py	2014-09-09 18:56:48 +0000
@@ -46,6 +46,14 @@
         """Return default configuration for this template, loaded from a
         config.yaml file.
 
+        This is a sample config.yaml that configures one user prompt::
+
+            prompts:
+              symlink:
+                prompt: Symlink all hooks to one python source file? [yN]
+                default: n
+                type: boolean
+
         """
         path = self.config_path()
         if os.path.exists(path):

=== added directory 'charmtools/templates/ansible'
=== added file 'charmtools/templates/ansible/__init__.py'
--- charmtools/templates/ansible/__init__.py	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/__init__.py	2014-09-09 18:56:48 +0000
@@ -0,0 +1,18 @@
+#!/usr/bin/python
+#
+#    Copyright (C) 2014  Canonical Ltd.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+from .template import AnsibleCharmTemplate  # noqa

=== added directory 'charmtools/templates/ansible/files'
=== added file 'charmtools/templates/ansible/files/Makefile'
--- charmtools/templates/ansible/files/Makefile	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/Makefile	2014-09-09 18:56:48 +0000
@@ -0,0 +1,24 @@
+#!/usr/bin/make
+
+build: virtualenv lint test
+
+virtualenv: .venv/bin/python
+.venv/bin/python:
+	sudo apt-get install python-virtualenv
+	virtualenv .venv
+	.venv/bin/pip install nose flake8 mock pyyaml
+
+lint:
+	@.venv/bin/flake8 hooks unit_tests
+	@charm proof
+
+test:
+	@echo Starting tests...
+	@CHARM_DIR=. PYTHONPATH=./hooks .venv/bin/nosetests --nologcapture unit_tests
+
+sync-charm-helpers:
+	@.venv/bin/python scripts/charm_helpers_sync.py -c charm-helpers.yaml
+
+clean:
+	rm -rf .venv
+	find -name *.pyc -delete

=== added file 'charmtools/templates/ansible/files/README.ex'
--- charmtools/templates/ansible/files/README.ex	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/README.ex	2014-09-09 18:56:48 +0000
@@ -0,0 +1,44 @@
+# Overview
+
+Describe the intended usage of this charm and anything unique about how this charm relates to others here.
+
+This README will be displayed in the Charm Store, it should be either Markdown or RST. Ideal READMEs include instructions on how to use the charm, expected usage, and charm features that your audience might be interested in. For an example of a well written README check out Hadoop: http://jujucharms.com/charms/precise/hadoop
+
+Use this as a Markdown reference if you need help with the formatting of this README: http://askubuntu.com/editing-help
+
+This charm provides [service](http://example.com). Add a description here of what the service itself actually does.
+
+Also remember to check the [icon guidelines](https://juju.ubuntu.com/docs/authors-charm-icon.html) so that your charm looks good in the Juju GUI.
+
+# Usage
+
+Step by step instructions on using the charm:
+
+    juju deploy servicename
+
+and so on. If you're providing a web service or something that the end user needs to go to, tell them here, especially if you're deploying a service that might listen to a non-default port.
+
+You can then browse to http://ip-address to configure the service.
+
+## Scale out Usage
+
+If the charm has any recommendations for running at scale, outline them in examples here. For example if you have a memcached relation that improves performance, mention it here.
+
+## Known Limitations and Issues
+
+This not only helps users but gives people a place to start if they want to help you add features to your charm.
+
+# Configuration
+
+The configuration options will be listed on the charm store, however If you're making assumptions or opinionated decisions in the charm (like setting a default administrator password), you should detail that here so the user knows how to change it immediately, etc.
+
+# Contact Information
+
+Though this will be listed in the charm store itself don't assume a user will know that, so include that information here:
+
+## Upstream Project Name
+
+- Upstream website
+- Upstream bug tracker
+- Upstream mailing list or contact information
+- Feel free to add things if it's useful for users

=== added file 'charmtools/templates/ansible/files/charm-helpers.yaml'
--- charmtools/templates/ansible/files/charm-helpers.yaml	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/charm-helpers.yaml	2014-09-09 18:56:48 +0000
@@ -0,0 +1,7 @@
+destination: lib/charmhelpers
+branch: lp:charm-helpers
+include:
+    - core
+    - fetch
+    - contrib.ansible|inc=*
+    - contrib.templating.contexts

=== added file 'charmtools/templates/ansible/files/config.yaml'
--- charmtools/templates/ansible/files/config.yaml	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/config.yaml	2014-09-09 18:56:48 +0000
@@ -0,0 +1,14 @@
+options:
+  string-option:
+    type: string
+    default: "Default Value"
+    description: "A short description of the configuration option"
+  boolean-option:
+    type: boolean
+    default: False
+    description: "A short description of the configuration option"
+  int-option:
+    type: int
+    default: 9001
+    description: "A short description of the configuration option"
+

=== added directory 'charmtools/templates/ansible/files/hooks'
=== added file 'charmtools/templates/ansible/files/hooks/hooks.py'
--- charmtools/templates/ansible/files/hooks/hooks.py	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/hooks/hooks.py	2014-09-09 18:56:48 +0000
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+
+import os
+import sys
+
+sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
+
+import charmhelpers.contrib.ansible
+
+# Create the hooks helper, passing a list of hooks which will be
+# handled by default by running all sections of the playbook
+# tagged with the hook name.
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbooks/site.yaml',
+    default_hooks=[
+        'start',
+        'stop',
+        'config-changed',
+        'upgrade-charm',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible.
+
+    The hook() helper decorating this install function ensures that after this
+    function finishes, any tasks in the playbook tagged with install or
+    upgrade-charm are executed.
+    """
+    charmhelpers.contrib.ansible.install_ansible_support(from_ppa=True)
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== added file 'charmtools/templates/ansible/files/icon.svg'
--- charmtools/templates/ansible/files/icon.svg	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/icon.svg	2014-09-09 18:56:48 +0000
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="96"
+   height="96"
+   id="svg6517"
+   version="1.1"
+   inkscape:version="0.48+devel r12274"
+   sodipodi:docname="Juju_charm_icon_template.svg">
+  <defs
+     id="defs6519">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#Background"
+       id="linearGradient6461"
+       gradientUnits="userSpaceOnUse"
+       x1="0"
+       y1="970.29498"
+       x2="144"
+       y2="970.29498"
+       gradientTransform="matrix(0,-0.66666669,0.6660448,0,-866.25992,731.29077)" />
+    <linearGradient
+       id="Background">
+      <stop
+         id="stop4178"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:1" />
+      <stop
+         id="stop4180"
+         offset="1"
+         style="stop-color:#c9c9c9;stop-opacity:1" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Inner Shadow"
+       id="filter1121">
+      <feFlood
+         flood-opacity="0.59999999999999998"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood1123" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="out"
+         result="composite1"
+         id="feComposite1125" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur1127" />
+      <feOffset
+         dx="0"
+         dy="2"
+         result="offset"
+         id="feOffset1129" />
+      <feComposite
+         in="offset"
+         in2="SourceGraphic"
+         operator="atop"
+         result="composite2"
+         id="feComposite1131" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB;"
+       inkscape:label="Drop Shadow"
+       id="filter950">
+      <feFlood
+         flood-opacity="0.25"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood952" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite954" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="1"
+         result="blur"
+         id="feGaussianBlur956" />
+      <feOffset
+         dx="0"
+         dy="1"
+         result="offset"
+         id="feOffset958" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite960" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath873">
+      <g
+         transform="matrix(0,-0.66666667,0.66604479,0,-258.25992,677.00001)"
+         id="g875"
+         inkscape:label="Layer 1"
+         style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline">
+        <path
+           style="fill:#ff00ff;fill-opacity:1;stroke:none;display:inline"
+           d="m 46.702703,898.22775 50.594594,0 C 138.16216,898.22775 144,904.06497 144,944.92583 l 0,50.73846 c 0,40.86071 -5.83784,46.69791 -46.702703,46.69791 l -50.594594,0 C 5.8378378,1042.3622 0,1036.525 0,995.66429 L 0,944.92583 C 0,904.06497 5.8378378,898.22775 46.702703,898.22775 Z"
+           id="path877"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="sssssssss" />
+      </g>
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter891"
+       inkscape:label="Badge Shadow">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.71999962"
+         id="feGaussianBlur893" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="4.0745362"
+     inkscape:cx="18.514671"
+     inkscape:cy="49.018169"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-width="1920"
+     inkscape:window-height="1029"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     showborder="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid821" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="16,48"
+       id="guide823" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,80"
+       id="guide825" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="80,40"
+       id="guide827" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="64,16"
+       id="guide829" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata6522">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="BACKGROUND"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(268,-635.29076)"
+     style="display:inline">
+    <path
+       style="fill:url(#linearGradient6461);fill-opacity:1;stroke:none;display:inline;filter:url(#filter1121)"
+       d="m -268,700.15563 0,-33.72973 c 0,-27.24324 3.88785,-31.13513 31.10302,-31.13513 l 33.79408,0 c 27.21507,0 31.1029,3.89189 31.1029,31.13513 l 0,33.72973 c 0,27.24325 -3.88783,31.13514 -31.1029,31.13514 l -33.79408,0 C -264.11215,731.29077 -268,727.39888 -268,700.15563 Z"
+       id="path6455"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sssssssss" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="PLACE YOUR PICTOGRAM HERE"
+     style="display:inline" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="BADGE"
+     style="display:none"
+     sodipodi:insensitive="true">
+    <g
+       style="display:inline"
+       transform="translate(-340.00001,-581)"
+       id="g4394"
+       clip-path="none">
+      <g
+         id="g855">
+        <g
+           inkscape:groupmode="maskhelper"
+           id="g870"
+           clip-path="url(#clipPath873)"
+           style="opacity:0.6;filter:url(#filter891)">
+          <path
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-237.54282)"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path844"
+             style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+        </g>
+        <g
+           id="g862">
+          <path
+             sodipodi:type="arc"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4398"
+             sodipodi:cx="252"
+             sodipodi:cy="552.36218"
+             sodipodi:rx="12"
+             sodipodi:ry="12"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             transform="matrix(1.4999992,0,0,1.4999992,-29.999795,-238.54282)" />
+          <path
+             transform="matrix(1.25,0,0,1.25,33,-100.45273)"
+             d="m 264,552.36218 a 12,12 0 1 1 -24,0 A 12,12 0 1 1 264,552.36218 Z"
+             sodipodi:ry="12"
+             sodipodi:rx="12"
+             sodipodi:cy="552.36218"
+             sodipodi:cx="252"
+             id="path4400"
+             style="color:#000000;fill:#dd4814;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             sodipodi:type="arc" />
+          <path
+             sodipodi:type="star"
+             style="color:#000000;fill:#f5f5f5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+             id="path4459"
+             sodipodi:sides="5"
+             sodipodi:cx="666.19574"
+             sodipodi:cy="589.50385"
+             sodipodi:r1="7.2431178"
+             sodipodi:r2="4.3458705"
+             sodipodi:arg1="1.0471976"
+             sodipodi:arg2="1.6755161"
+             inkscape:flatsided="false"
+             inkscape:rounded="0.1"
+             inkscape:randomized="0"
+             d="m 669.8173,595.77657 c -0.39132,0.22593 -3.62645,-1.90343 -4.07583,-1.95066 -0.44938,-0.0472 -4.05653,1.36297 -4.39232,1.06062 -0.3358,-0.30235 0.68963,-4.03715 0.59569,-4.47913 -0.0939,-0.44198 -2.5498,-3.43681 -2.36602,-3.8496 0.18379,-0.41279 4.05267,-0.59166 4.44398,-0.81759 0.39132,-0.22593 2.48067,-3.48704 2.93005,-3.4398 0.44938,0.0472 1.81505,3.67147 2.15084,3.97382 0.3358,0.30236 4.08294,1.2817 4.17689,1.72369 0.0939,0.44198 -2.9309,2.86076 -3.11469,3.27355 C 669.9821,591.68426 670.20862,595.55064 669.8173,595.77657 Z"
+             transform="matrix(1.511423,-0.16366377,0.16366377,1.511423,-755.37346,-191.93651)" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>

=== added file 'charmtools/templates/ansible/files/metadata.yaml'
--- charmtools/templates/ansible/files/metadata.yaml	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/metadata.yaml	2014-09-09 18:56:48 +0000
@@ -0,0 +1,17 @@
+name: $metadata.package
+summary: $metadata.summary
+maintainer: $metadata.maintainer
+description: |
+  $metadata.description
+categories:
+  - misc
+subordinate: false
+provides:
+  provides-relation:
+    interface: interface-name
+requires:
+  requires-relation:
+    interface: interface-name
+peers:
+  peer-relation:
+    interface: interface-name

=== added directory 'charmtools/templates/ansible/files/playbooks'
=== added file 'charmtools/templates/ansible/files/playbooks/site.yaml'
--- charmtools/templates/ansible/files/playbooks/site.yaml	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/playbooks/site.yaml	2014-09-09 18:56:48 +0000
@@ -0,0 +1,47 @@
+# The tasks here are left as examples and should be removed/replaced by the
+# charm author. Some things to note:
+#
+# 1. All charm config values are available as template variables
+#    e.g. repo -> {{repo}}, app-name -> {{app_name}} (note underscore)
+#
+# 2. Along with charm config values, the following variables are also
+#    made available as template vars:
+#
+#    charm_dir
+#    local_unit
+#    unit_private_address
+#    unit_public_address
+#
+# 3. Use tags to control when each task is executed. The tags list should
+#    contain one or more hook names.
+
+- hosts: all
+  tasks:
+
+    - name: Install required packages.
+      apt: pkg={{ item }} state=latest update_cache=yes
+      with_items:
+        - python-django
+        - python-django-celery
+      tags:
+        - install
+        - upgrade-charm
+
+    - name: Put app code in place.
+      git: repo=git://github.com/absoludity/charm-bootstrap-ansible.git
+           dest=/srv/myapp
+           version=HEAD
+      tags:
+        - install
+        - config-changed
+
+    - name: Start service
+      debug: msg="You'd start some service here. The config 'string-option' has the value '{{ string_option }}'"
+      tags:
+        - start
+        - config-changed
+
+    - name: Stop service
+      debug: msg="You'd stop some service here. The config 'string-option' is '{{ string_option }}'"
+      tags:
+        - stop

=== added file 'charmtools/templates/ansible/files/revision'
--- charmtools/templates/ansible/files/revision	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/revision	2014-09-09 18:56:48 +0000
@@ -0,0 +1,1 @@
+1

=== added directory 'charmtools/templates/ansible/files/scripts'
=== added file 'charmtools/templates/ansible/files/scripts/charm_helpers_sync.py'
--- charmtools/templates/ansible/files/scripts/charm_helpers_sync.py	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/scripts/charm_helpers_sync.py	2014-09-09 18:56:48 +0000
@@ -0,0 +1,225 @@
+#!/usr/bin/python
+#
+# Copyright 2013 Canonical Ltd.
+
+# Authors:
+#   Adam Gandelman <[e-mail]>
+#
+
+import logging
+import optparse
+import os
+import subprocess
+import shutil
+import sys
+import tempfile
+import yaml
+
+from fnmatch import fnmatch
+
+CHARM_HELPERS_BRANCH = 'lp:charm-helpers'
+
+
+def parse_config(conf_file):
+    if not os.path.isfile(conf_file):
+        logging.error('Invalid config file: %s.' % conf_file)
+        return False
+    return yaml.load(open(conf_file).read())
+
+
+def clone_helpers(work_dir, branch):
+    dest = os.path.join(work_dir, 'charm-helpers')
+    logging.info('Checking out %s to %s.' % (branch, dest))
+    cmd = ['bzr', 'branch', branch, dest]
+    subprocess.check_call(cmd)
+    return dest
+
+
+def _module_path(module):
+    return os.path.join(*module.split('.'))
+
+
+def _src_path(src, module):
+    return os.path.join(src, 'charmhelpers', _module_path(module))
+
+
+def _dest_path(dest, module):
+    return os.path.join(dest, _module_path(module))
+
+
+def _is_pyfile(path):
+    return os.path.isfile(path + '.py')
+
+
+def ensure_init(path):
+    '''
+    ensure directories leading up to path are importable, omitting
+    parent directory, eg path='/hooks/helpers/foo'/:
+        hooks/
+        hooks/helpers/__init__.py
+        hooks/helpers/foo/__init__.py
+    '''
+    for d, dirs, files in os.walk(os.path.join(*path.split('/')[:2])):
+        _i = os.path.join(d, '__init__.py')
+        if not os.path.exists(_i):
+            logging.info('Adding missing __init__.py: %s' % _i)
+            open(_i, 'wb').close()
+
+
+def sync_pyfile(src, dest):
+    src = src + '.py'
+    src_dir = os.path.dirname(src)
+    logging.info('Syncing pyfile: %s -> %s.' % (src, dest))
+    if not os.path.exists(dest):
+        os.makedirs(dest)
+    shutil.copy(src, dest)
+    if os.path.isfile(os.path.join(src_dir, '__init__.py')):
+        shutil.copy(os.path.join(src_dir, '__init__.py'),
+                    dest)
+    ensure_init(dest)
+
+
+def get_filter(opts=None):
+    opts = opts or []
+    if 'inc=*' in opts:
+        # do not filter any files, include everything
+        return None
+
+    def _filter(dir, ls):
+        incs = [opt.split('=').pop() for opt in opts if 'inc=' in opt]
+        _filter = []
+        for f in ls:
+            _f = os.path.join(dir, f)
+
+            if not os.path.isdir(_f) and not _f.endswith('.py') and incs:
+                if True not in [fnmatch(_f, inc) for inc in incs]:
+                    logging.debug('Not syncing %s, does not match include '
+                                  'filters (%s)' % (_f, incs))
+                    _filter.append(f)
+                else:
+                    logging.debug('Including file, which matches include '
+                                  'filters (%s): %s' % (incs, _f))
+            elif (os.path.isfile(_f) and not _f.endswith('.py')):
+                logging.debug('Not syncing file: %s' % f)
+                _filter.append(f)
+            elif (os.path.isdir(_f) and not
+                  os.path.isfile(os.path.join(_f, '__init__.py'))):
+                logging.debug('Not syncing directory: %s' % f)
+                _filter.append(f)
+        return _filter
+    return _filter
+
+
+def sync_directory(src, dest, opts=None):
+    if os.path.exists(dest):
+        logging.debug('Removing existing directory: %s' % dest)
+        shutil.rmtree(dest)
+    logging.info('Syncing directory: %s -> %s.' % (src, dest))
+
+    shutil.copytree(src, dest, ignore=get_filter(opts))
+    ensure_init(dest)
+
+
+def sync(src, dest, module, opts=None):
+    if os.path.isdir(_src_path(src, module)):
+        sync_directory(_src_path(src, module), _dest_path(dest, module), opts)
+    elif _is_pyfile(_src_path(src, module)):
+        sync_pyfile(_src_path(src, module),
+                    os.path.dirname(_dest_path(dest, module)))
+    else:
+        logging.warn('Could not sync: %s. Neither a pyfile or directory, '
+                     'does it even exist?' % module)
+
+
+def parse_sync_options(options):
+    if not options:
+        return []
+    return options.split(',')
+
+
+def extract_options(inc, global_options=None):
+    global_options = global_options or []
+    if global_options and isinstance(global_options, basestring):
+        global_options = [global_options]
+    if '|' not in inc:
+        return (inc, global_options)
+    inc, opts = inc.split('|')
+    return (inc, parse_sync_options(opts) + global_options)
+
+
+def sync_helpers(include, src, dest, options=None):
+    if not os.path.isdir(dest):
+        os.mkdir(dest)
+
+    global_options = parse_sync_options(options)
+
+    for inc in include:
+        if isinstance(inc, str):
+            inc, opts = extract_options(inc, global_options)
+            sync(src, dest, inc, opts)
+        elif isinstance(inc, dict):
+            # could also do nested dicts here.
+            for k, v in inc.iteritems():
+                if isinstance(v, list):
+                    for m in v:
+                        inc, opts = extract_options(m, global_options)
+                        sync(src, dest, '%s.%s' % (k, inc), opts)
+
+if __name__ == '__main__':
+    parser = optparse.OptionParser()
+    parser.add_option('-c', '--config', action='store', dest='config',
+                      default=None, help='helper config file')
+    parser.add_option('-D', '--debug', action='store_true', dest='debug',
+                      default=False, help='debug')
+    parser.add_option('-b', '--branch', action='store', dest='branch',
+                      help='charm-helpers bzr branch (overrides config)')
+    parser.add_option('-d', '--destination', action='store', dest='dest_dir',
+                      help='sync destination dir (overrides config)')
+    (opts, args) = parser.parse_args()
+
+    if opts.debug:
+        logging.basicConfig(level=logging.DEBUG)
+    else:
+        logging.basicConfig(level=logging.INFO)
+
+    if opts.config:
+        logging.info('Loading charm helper config from %s.' % opts.config)
+        config = parse_config(opts.config)
+        if not config:
+            logging.error('Could not parse config from %s.' % opts.config)
+            sys.exit(1)
+    else:
+        config = {}
+
+    if 'branch' not in config:
+        config['branch'] = CHARM_HELPERS_BRANCH
+    if opts.branch:
+        config['branch'] = opts.branch
+    if opts.dest_dir:
+        config['destination'] = opts.dest_dir
+
+    if 'destination' not in config:
+        logging.error('No destination dir. specified as option or config.')
+        sys.exit(1)
+
+    if 'include' not in config:
+        if not args:
+            logging.error('No modules to sync specified as option or config.')
+            sys.exit(1)
+        config['include'] = []
+        [config['include'].append(a) for a in args]
+
+    sync_options = None
+    if 'options' in config:
+        sync_options = config['options']
+    tmpd = tempfile.mkdtemp()
+    try:
+        checkout = clone_helpers(tmpd, config['branch'])
+        sync_helpers(config['include'], checkout, config['destination'],
+                     options=sync_options)
+    except Exception, e:
+        logging.error("Could not sync: %s" % e)
+        raise e
+    finally:
+        logging.debug('Cleaning up %s' % tmpd)
+        shutil.rmtree(tmpd)

=== added directory 'charmtools/templates/ansible/files/unit_tests'
=== added file 'charmtools/templates/ansible/files/unit_tests/test_hooks.py'
--- charmtools/templates/ansible/files/unit_tests/test_hooks.py	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/files/unit_tests/test_hooks.py	2014-09-09 18:56:48 +0000
@@ -0,0 +1,62 @@
+import unittest
+
+try:
+    import mock
+except ImportError:
+    raise ImportError(
+        "Please ensure both python-mock and python-nose are installed.")
+
+
+from hooks import hooks
+
+
+class InstallHookTestCase(unittest.TestCase):
+
+    def setUp(self):
+        super(InstallHookTestCase, self).setUp()
+
+        patcher = mock.patch('hooks.charmhelpers')
+        self.mock_charmhelpers = patcher.start()
+        self.addCleanup(patcher.stop)
+        self.mock_charmhelpers.core.hookenv.config.return_value = {
+            'install_deps_from_ppa': False,
+        }
+
+        patcher = mock.patch('charmhelpers.contrib.ansible.apply_playbook')
+        self.mock_apply_playbook = patcher.start()
+        self.addCleanup(patcher.stop)
+
+    def test_installs_ansible_support(self):
+        hooks.execute(['install'])
+
+        ansible = self.mock_charmhelpers.contrib.ansible
+        ansible.install_ansible_support.assert_called_once_with(
+            from_ppa=True)
+
+    def test_applies_install_playbook(self):
+        hooks.execute(['install'])
+
+        self.assertEqual([
+            mock.call('playbooks/site.yaml', tags=['install']),
+        ], self.mock_apply_playbook.call_args_list)
+
+
+class DefaultHooksTestCase(unittest.TestCase):
+
+    def setUp(self):
+        super(DefaultHooksTestCase, self).setUp()
+        patcher = mock.patch('charmhelpers.contrib.ansible.apply_playbook')
+        self.mock_apply_playbook = patcher.start()
+        self.addCleanup(patcher.stop)
+
+    def test_default_hooks(self):
+        """Most of the hooks let ansible do all the work."""
+        for hook in ('start', 'stop', 'config-changed'):
+            self.mock_apply_playbook.reset_mock()
+
+            hooks.execute([hook])
+
+            self.assertEqual([
+                mock.call('playbooks/site.yaml',
+                          tags=[hook]),
+            ], self.mock_apply_playbook.call_args_list)

=== added file 'charmtools/templates/ansible/template.py'
--- charmtools/templates/ansible/template.py	1970-01-01 00:00:00 +0000
+++ charmtools/templates/ansible/template.py	2014-09-09 18:56:48 +0000
@@ -0,0 +1,88 @@
+#!/usr/bin/python
+#
+#    Copyright (C) 2014  Canonical Ltd.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import logging
+import os
+import os.path as path
+import time
+import shutil
+import subprocess
+import tempfile
+
+from Cheetah.Template import Template
+from stat import ST_MODE
+
+from charmtools.generators import (
+    CharmTemplate,
+)
+
+log = logging.getLogger(__name__)
+
+
+class AnsibleCharmTemplate(CharmTemplate):
+    skip_parsing = ['README.ex', 'Makefile']
+
+    def create_charm(self, config, output_dir):
+        self._copy_files(output_dir)
+
+        for root, dirs, files in os.walk(output_dir):
+            for outfile in files:
+                if outfile in self.skip_parsing:
+                    continue
+
+                self._template_file(config, path.join(root, outfile))
+
+        self._cleanup_hooks(config, output_dir)
+        self._install_charmhelpers(output_dir)
+
+    def _copy_files(self, output_dir):
+        here = path.abspath(path.dirname(__file__))
+        template_dir = path.join(here, 'files')
+        if os.path.exists(output_dir):
+            shutil.rmtree(output_dir)
+        shutil.copytree(template_dir, output_dir)
+
+    def _template_file(self, config, outfile):
+        if path.islink(outfile):
+            return
+
+        mode = os.stat(outfile)[ST_MODE]
+        t = Template(file=outfile, searchList=(config))
+        o = tempfile.NamedTemporaryFile(
+            dir=path.dirname(outfile), delete=False)
+        os.chmod(o.name, mode)
+        o.write(str(t))
+        o.close()
+        backupname = outfile + str(time.time())
+        os.rename(outfile, backupname)
+        os.rename(o.name, outfile)
+        os.unlink(backupname)
+
+    def _cleanup_hooks(self, config, output_dir):
+        # Symlinks must be relative so that they are copied properly
+        # when output_dir is moved to it's final location.
+        for link in ['config-changed', 'install', 'start', 'stop',
+                     'upgrade-charm']:
+            os.symlink('hooks.py', os.path.join(output_dir, 'hooks', link))
+
+    def _install_charmhelpers(self, output_dir):
+        helpers_dest = os.path.join(output_dir, 'lib', 'charmhelpers')
+        if not os.path.exists(helpers_dest):
+            os.makedirs(helpers_dest)
+
+        cmd = './scripts/charm_helpers_sync.py -c charm-helpers.yaml'
+        subprocess.check_call(cmd.split(), cwd=output_dir)

=== removed file 'charmtools/templates/python/config.yaml'
--- charmtools/templates/python/config.yaml	2014-05-27 21:23:41 +0000
+++ charmtools/templates/python/config.yaml	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-prompts:
-  symlink:
-    prompt: Symlink all hooks to one python source file? [yN]
-    default: n
-    type: boolean

=== removed directory 'charmtools/templates/python/files/hooks_symlinked'
=== removed file 'charmtools/templates/python/files/hooks_symlinked/hooks.py'
--- charmtools/templates/python/files/hooks_symlinked/hooks.py	2014-05-27 21:23:41 +0000
+++ charmtools/templates/python/files/hooks_symlinked/hooks.py	1970-01-01 00:00:00 +0000
@@ -1,54 +0,0 @@
-#!/usr/bin/python
-
-import os
-import sys
-
-sys.path.insert(0, os.path.join(os.environ['CHARM_DIR'], 'lib'))
-
-from charmhelpers.core import (
-    hookenv,
-    host,
-)
-
-hooks = hookenv.Hooks()
-log = hookenv.log
-
-SERVICE = '$metadata.package'
-
-
[e-mail]('install')
-def install():
-    log('Installing $metadata.package')
-
-
[e-mail]('config-changed')
-def config_changed():
-    config = hookenv.config()
-
-    for key in config:
-        if config.changed(key):
-            log("config['{}'] changed from {} to {}".format(
-                key, config.previous(key), config[key]))
-
-    config.save()
-    start()
-
-
[e-mail]('upgrade-charm')
-def upgrade_charm():
-    log('Upgrading $metadata.package')
-
-
[e-mail]('start')
-def start():
-    host.service_restart(SERVICE) or host.service_start(SERVICE)
-
-
[e-mail]('stop')
-def stop():
-    host.service_stop(SERVICE)
-
-
-if __name__ == "__main__":
-    # execute a hook based on the name the program is called by
-    hooks.execute(sys.argv)

=== modified file 'charmtools/templates/python/template.py'
--- charmtools/templates/python/template.py	2014-07-29 18:15:41 +0000
+++ charmtools/templates/python/template.py	2014-09-09 18:56:48 +0000
@@ -46,7 +46,6 @@
 
                 self._template_file(config, path.join(root, outfile))
 
-        self._cleanup_hooks(config, output_dir)
         self._install_charmhelpers(output_dir)
 
     def _copy_files(self, output_dir):
@@ -72,21 +71,6 @@
         os.rename(o.name, outfile)
         os.unlink(backupname)
 
-    def _cleanup_hooks(self, config, output_dir):
-        rmdir = 'hooks' if config['symlink'] else 'hooks_symlinked'
-        shutil.rmtree(os.path.join(output_dir, rmdir))
-
-        if config['symlink']:
-            os.rename(
-                os.path.join(output_dir, 'hooks_symlinked'),
-                os.path.join(output_dir, 'hooks')
-            )
-            # Symlinks must be relative so that they are copied properly
-            # when output_dir is moved to it's final location.
-            for link in ['config-changed', 'install', 'start', 'stop',
-                         'upgrade-charm']:
-                os.symlink('hooks.py', os.path.join(output_dir, 'hooks', link))
-
     def _install_charmhelpers(self, output_dir):
         helpers_dest = os.path.join(output_dir, 'lib', 'charmhelpers')
         if not os.path.exists(helpers_dest):

=== modified file 'setup.py'
--- setup.py	2014-06-23 14:44:59 +0000
+++ setup.py	2014-09-09 18:56:48 +0000
@@ -58,6 +58,7 @@
         'charmtools.templates': [
             'bash = charmtools.templates.bash:BashCharmTemplate',
             'python = charmtools.templates.python:PythonCharmTemplate',
+            'ansible = charmtools.templates.ansible:AnsibleCharmTemplate',
         ]
     },
 )

=== modified file 'tests/test_charm_proof.py'
--- tests/test_charm_proof.py	2014-06-17 15:44:04 +0000
+++ tests/test_charm_proof.py	2014-09-09 18:56:48 +0000
@@ -420,7 +420,10 @@
         """Maintainers field happy path."""
         linter = Mock()
         charm = {
-            'maintainers': ['Tester <[e-mail]>'],
+            'maintainers': [
+                'Tester <[e-mail]>',
+                'Tester Joe H. <[e-mail]>',
+            ]
         }
         validate_maintainer(charm, linter)
         self.assertFalse(linter.err.called)

=== modified file 'tests_functional/create/test.sh'
--- tests_functional/create/test.sh	2014-06-12 00:21:24 +0000
+++ tests_functional/create/test.sh	2014-09-09 18:56:48 +0000
@@ -52,6 +52,9 @@
 echo ===== Testing python charm template =====
 $PYTHON $TESTDIR/test_python_create.py
 
+echo ===== Testing ansible charm template =====
+$PYTHON $TESTDIR/test_ansible_create.py
+
 echo ===== All tests passed! =====
 echo PASS
 set +e

=== added file 'tests_functional/create/test_ansible_create.py'
--- tests_functional/create/test_ansible_create.py	1970-01-01 00:00:00 +0000
+++ tests_functional/create/test_ansible_create.py	2014-09-09 18:56:48 +0000
@@ -0,0 +1,101 @@
+#!/usr/bin/python
+
+#    Copyright (C) 2014  Canonical Ltd.
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+import shutil
+import tempfile
+import unittest
+
+from mock import patch
+from os.path import join
+from unittest import TestCase
+
+import pkg_resources
+import yaml
+
+from charmtools.create import (
+    main,
+)
+
+
+def flatten(path):
+    for root, dirs, files in os.walk(path):
+        for f in files:
+            yield join(root[len(path):], f).lstrip('/')
+
+
+class AnsibleCreateTest(TestCase):
+    maxDiff = None
+    def setUp(self):
+        self.tempdir = tempfile.mkdtemp()
+
+    def tearDown(self):
+        shutil.rmtree(self.tempdir)
+
+    def _expected_files(self):
+        static_files = list(flatten(pkg_resources.resource_filename(
+            'charmtools', 'templates/ansible/files')))
+        dynamic_files = [
+            'hooks/config-changed',
+            'hooks/install',
+            'hooks/start',
+            'hooks/stop',
+            'hooks/upgrade-charm',
+            'lib/charmhelpers/__init__.py',
+            'lib/charmhelpers/contrib/__init__.py',
+            'lib/charmhelpers/contrib/ansible/__init__.py',
+            'lib/charmhelpers/contrib/templating/__init__.py',
+            'lib/charmhelpers/contrib/templating/contexts.py',
+            'lib/charmhelpers/core/__init__.py',
+            'lib/charmhelpers/core/fstab.py',
+            'lib/charmhelpers/core/hookenv.py',
+            'lib/charmhelpers/core/host.py',
+            'lib/charmhelpers/core/services/__init__.py',
+            'lib/charmhelpers/core/services/base.py',
+            'lib/charmhelpers/core/services/helpers.py',
+            'lib/charmhelpers/core/templating.py',
+            'lib/charmhelpers/fetch/__init__.py',
+            'lib/charmhelpers/fetch/archiveurl.py',
+            'lib/charmhelpers/fetch/bzrurl.py',
+        ]
+        return sorted(static_files + dynamic_files)
+
+    @patch('charmtools.create.setup_parser')
+    def test_default(self, setup_parser):
+        """Test of `charm create -t ansible testcharm`"""
+        class args(object):
+            charmname = 'testcharm'
+            charmhome = self.tempdir
+            template = 'ansible'
+            accept_defaults = True
+            verbose = False
+
+        setup_parser.return_value.parse_args.return_value = args
+
+        main()
+
+        outputdir = join(self.tempdir, args.charmname)
+        actual_files = sorted(flatten(outputdir))
+        expected_files = self._expected_files()
+        metadata = yaml.load(open(join(outputdir, 'metadata.yaml'), 'r'))
+
+        self.assertEqual(expected_files, actual_files)
+        self.assertEqual(metadata['name'], args.charmname)
+
+
+if __name__ == '__main__':
+    unittest.main()

=== modified file 'tests_functional/create/test_python_create.py'
--- tests_functional/create/test_python_create.py	2014-06-20 19:46:59 +0000
+++ tests_functional/create/test_python_create.py	2014-09-09 18:56:48 +0000
@@ -45,46 +45,22 @@
     def tearDown(self):
         shutil.rmtree(self.tempdir)
 
-    def _expected_files(self, symlinked=False):
+    def _expected_files(self):
         static_files = list(flatten(pkg_resources.resource_filename(
             'charmtools', 'templates/python/files')))
-        static_files = [f for f in static_files
-                        if not f.startswith('hooks_symlinked/')]
-        if symlinked:
-            static_files.append('hooks/hooks.py')
         dynamic_files = [
             'lib/charmhelpers/__init__.py',
             'lib/charmhelpers/core/__init__.py',
             'lib/charmhelpers/core/fstab.py',
             'lib/charmhelpers/core/hookenv.py',
             'lib/charmhelpers/core/host.py',
+            'lib/charmhelpers/core/services/__init__.py',
+            'lib/charmhelpers/core/services/base.py',
+            'lib/charmhelpers/core/services/helpers.py',
+            'lib/charmhelpers/core/templating.py',
         ]
         return sorted(static_files + dynamic_files)
 
-    @patch('__builtin__.raw_input')
-    @patch('charmtools.create.setup_parser')
-    def test_interactive(self, setup_parser, raw_input_):
-        """Functional test of a full 'charm create' run."""
-        class args(object):
-            charmname = 'testcharm'
-            charmhome = self.tempdir
-            template = 'python'
-            accept_defaults = False
-            verbose = False
-
-        setup_parser.return_value.parse_args.return_value = args
-        raw_input_.side_effect = ['Y']
-
-        main()
-
-        outputdir = join(self.tempdir, args.charmname)
-        actual_files = sorted(flatten(outputdir))
-        expected_files = self._expected_files(symlinked=True)
-        metadata = yaml.load(open(join(outputdir, 'metadata.yaml'), 'r'))
-
-        self.assertEqual(expected_files, actual_files)
-        self.assertEqual(metadata['name'], args.charmname)
-
     @patch('charmtools.create.setup_parser')
     def test_defaults(self, setup_parser):
         """Functional test of a full 'charm create' run."""