Merge lp:~patrick-hetu/charms/precise/python-django/charmhelpers into lp:~charmers/charms/precise/python-django/trunk

[Patrick Hetu]

- The charm now use charm-helpers for hooks
- The chams now use ansible for installation
- Mysql and Redis support was added
- The charm can install South and do migrations (code from Ubuntu's ci-services)
- The charm include a Fabric and Ansible scripts to interact with Juju

[lp:~patrick-hetu/charms/precise/python-django/charmhelpers]

50. By Patrick Hetu on 2014-04-17

forgot mirror urls in the playbook

51. By Patrick Hetu on 2014-04-17

fix settings path in the fabfile

52. By Patrick Hetu on 2014-04-17

add a new pip_extra_args option

53. By Patrick Hetu on 2014-04-23

don't make python-path starts with a colon

54. By Patrick Hetu on 2014-04-24

fix single python-path for fabfile.py

55. By Patrick Hetu on 2014-04-25

add rabbitmq support

56. By Patrick Hetu on 2014-04-28

drop http pip requirements as I can get it to work with ansible

57. By Patrick Hetu on 2014-04-29

awk to the rescue: Re-enable http pip requirements support

58. By Patrick Hetu on 2014-04-30

merge george-edison55's readme corrections

59. By Patrick Hetu on 2014-04-30

add configurable amqp vhost

60. By Patrick Hetu on 2014-04-30

merge with trunk

61. By Patrick Hetu on 2014-05-02

fix a wrong configuration variable name

[Charles Butler (lazypower)]

Patrick,

Wow, this was a pretty significant change! I've reviewed the incoming changes and have the following notes:

This is an interesting mix of Ansible and plane ole python hook code. What was the prompt to move the cloning bits to Ansible vs just using the python hooks for installation? Not a nack, just really curious about the architecture design pattern.

Knitpicks:
There is a missing 00-setup script for the included test, and missing dependencies prevented the test execution from completing successfully on first run.

The tests also report errors as is, and are a prime candidate for being rewritten in amulet, or refactored as is so they pass.

Aside from these comments, I see no major blockers.

Thanks again! +1 LGTM

[Charles Butler (lazypower)]

review: Approve

[Patrick Hetu (patrick-hetu)]

About Ansible, I'm still new to all this but in the next merge requests
it should be more consistent and use only Ansible.

Same thing for the tests, I'll switch to unittest + amulet in the next MR.

[lp:~patrick-hetu/charms/precise/python-django/charmhelpers]

62. By Patrick Hetu on 2014-05-09

get the latest version of charmhelpers

63. By Patrick Hetu on 2014-05-23

try to find settings.py in application_path if it is set

[Patrick Hetu (patrick-hetu)]

commit 62 fixes bug #1318036

[lp:~patrick-hetu/charms/precise/python-django/charmhelpers]

64. By Patrick Hetu on 2014-06-11

migrate to Ansible

65. By Patrick Hetu on 2014-06-13

pull playbooks and minor fixes

66. By Patrick Hetu on 2014-06-13

always install django first

67. By Patrick Hetu on 2014-06-30

refactoring for reusability

68. By Patrick Hetu on 2014-07-02

tests refactoring

69. By Patrick Hetu on 2014-07-03

separation of test in django versions and postgresql tests

70. By Patrick Hetu on 2014-07-07

test only version distro, 1.3 and 1.4

71. By Patrick Hetu on 2014-07-07

test only version distro, 1.3 and 1.4

[Charles Butler (lazypower)]

Greetings Patrick,

Looks like progress has continued to land on the Python-Django charm. I've taken the liberty of reviewing the most recent revision and I have the following notes:

There is a proof error:
W: config.yaml: option django_uid does not have the keys: description
W: config.yaml: option django_gid does not have the keys: description

and I also ran into some troubles with the included integration tests. Attaching tracebacks:

2014-09-08 21:05:12,160 INFO Unavailable, retrying: http://ec2-54-167-142-245.compute-1.amazonaws.com:8080/
ERROR

======================================================================
ERROR: setUpModule (__main__)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/10-postgresql", line 36, in setUpModule
    attempts=10, retry_unavailable=True)
  File "/home/ubuntu/charms/precise/python-django/tests/helpers/__init__.py", line 51, in check_url
    sys.stdout.flush()
BrokenPipeError: [Errno 32] Broken pipe

----------------------------------------------------------------------
Ran 0 tests in 679.730s

FAILED (errors=1)
Exception ignored in: <_io.TextIOWrapper name='<stdout>' mode='w' encoding='ANSI_X3.4-1968'>
BrokenPipeError: [Errno 32] Broken pipe
2014-09-08 21:05:55,425 INFO Unavailable, retrying: http://ec2-54-234-57-45.compute-1.amazonaws.com:8080/
ERROR

======================================================================
ERROR: test_app (01-versions.LandscapeServiceTests)
Verify that the APP service is up.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/01-versions", line 58, in test_app
    attempts=10, retry_unavailable=True)
  File "/home/ubuntu/charms/precise/python-django/tests/helpers/__init__.py", line 51, in check_url
    sys.stdout.flush()
BrokenPipeError: [Errno 32] Broken pipe

----------------------------------------------------------------------
Ran 1 test in 1558.975s

FAILED (errors=1)
Exception ignored in: <_io.TextIOWrapper name='<stdout>' mode='w' encoding='ANSI_X3.4-1968'>
BrokenPipeError: [Errno 32] Broken pipe

Thanks again for the submission, I look forward to the next iteration and progress!

review: Needs Fixing

Unmerged revisions

71. By Patrick Hetu on 2014-07-07

test only version distro, 1.3 and 1.4

70. By Patrick Hetu on 2014-07-07

test only version distro, 1.3 and 1.4

69. By Patrick Hetu on 2014-07-03

separation of test in django versions and postgresql tests

68. By Patrick Hetu on 2014-07-02

tests refactoring

67. By Patrick Hetu on 2014-06-30

refactoring for reusability

66. By Patrick Hetu on 2014-06-13

always install django first

65. By Patrick Hetu on 2014-06-13

pull playbooks and minor fixes

64. By Patrick Hetu on 2014-06-11

migrate to Ansible

63. By Patrick Hetu on 2014-05-23

try to find settings.py in application_path if it is set

62. By Patrick Hetu on 2014-05-09

get the latest version of charmhelpers

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2014-07-07 20:28:28 +0000
@@ -0,0 +1,29 @@
+#!/usr/bin/make
+PYTHON := /usr/bin/env python
+
+test: lint integration-test
+
+sync-charm-helpers: bin/charm_helpers_sync.py
+	@mkdir -p bin
+	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers.yaml
+
+bin/charm_helpers_sync.py:
+	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py > bin/charm_helpers_sync.py
+
+lint:
+	@echo "Lint check (flake8)"
+	@flake8 -v --ignore E501 --exclude hooks/charmhelpers hooks
+
+verify-juju-test:
+	@echo "Checking for ... "
+	@echo -n "juju-test: "
+	@if [ -z `which juju-test` ]; then \
+	    echo -e "\nRun ./dev/ubuntu-deps to get the juju-test command installed"; \
+	    exit 1;\
+	else \
+	    echo "installed"; \
+	fi
+
+integration-test:
+	juju test --set-e -p SKIP_SLOW_TESTS,DEPLOYER_TARGET,JUJU_HOME,JUJU_ENV -v --timeout 3000s
+

=== modified file 'README.md'
--- README.md	2014-04-05 21:46:36 +0000
+++ README.md	2014-07-07 20:28:28 +0000
@@ -1,8 +1,8 @@
 # Python-django Charm
 
-Authors: 
+Authors:
 
-- Patrick Hetu <[e-mail]> 
+- Patrick Hetu <[e-mail]>
 - Bruno Girin
 
 ## What is Django?
@@ -16,7 +16,7 @@
 many generic third-party "applications" are available to enhance
 projects or to simply reduce development time even further.
 
-Notable features include: 
+Notable features include:
 
 - An object-relational mapper (ORM)
 - Automatic admin interface
@@ -66,9 +66,6 @@
             project_template_url: https://github.com/xenith/django-base-template/zipball/master
             project_template_extension: py,md,rst
 
-   Note: If you're using juju-core you must remove the first line
-   of the file and the indentation for the rest of the file.
-
 1. Deployment with `Gunicorn`:
 
         juju bootstrap
@@ -90,23 +87,17 @@
             vcs: bzr
             repos_url: lp:~patrick-hetu/my_site
 
-   Note: If you're using juju-core you must remove the first line
-   of the file and the indentation for the rest of the file.
-
 1. Deployment with `Gunicorn`:
 
         juju bootstrap
-        juju deploy --config mydjangosite.yaml python-django
+        juju deploy --config mydjangosite.yaml python-django mydjangosite
 
         juju deploy postgresql
         juju add-relation python-django postgresql:db
 
         juju deploy gunicorn
-        juju add-relation python-django gunicorn
-        juju expose python-django
-
-   Note: If you're using juju-core you must add --upload-tools to the
-   `juju bootstrap` command.
+        juju add-relation mydjangosite gunicorn
+        juju expose mydjangosite
 
 1. Your new Django site should be accessible at the public address of
    Gunicorn. To find it, look for it in the output of the `juju status` command.  
@@ -115,7 +106,7 @@
 
 Continuing from the previous example, your web site should be on the Django node at:
 
-    /srv/python-django/
+    /srv/mydjangosite/
 
 As you can see there the charm has injected some code at the end of your settings.py
 file (or created it if it was not there) to be able to import what's in the
@@ -124,6 +115,23 @@
 It's recommended that you make your vcs ignore database and secret files or
 any files that have information that you don't want to publish.
 
+## Complex configuration example: dpaste
+
+    mydpastesite:
+      django_version: ''
+      django_south: True
+      django_south_version: ''
+      vcs: 'git'
+      repos_url: 'https://github.com/bartTC/dpaste.git'
+      repos_branch: '2.6'
+      application_path: 'dpaste'
+      django_settings: 'dpaste.settings'
+      settings_injection_path: 'settings/__init__.py'
+      urls_injection_path: 'urls/__init__.py'
+      requirements_pip_files: 'requirements.txt'
+      additional_distro_packages: "python-imaging,python-tz,python-dev,build-essential,libpq-dev,libmysqlclient-dev,libxml2-dev,libxslt1-dev"
+
+
 ## Upgrade the charm
 
 This charm allow you to upgrade your deployment using Juju's `upgrade-charm`
@@ -174,6 +182,10 @@
 
 If you want to extend the fabfile check out [fabtools](http://fabtools.readthedocs.org/).
 
+## Ansible
+
+See: https://github.com/cmars/juju-ansible
+
 ## Security
 
 Note that if you're using a `requirement.txt` file the packages will
@@ -207,6 +219,64 @@
 
 ## Changelog
 
+### X: Not yet released
+
+- Ansible only rewrite
+- Python3 compatibility
+- Support for Django 1.7
+- Support for virtualenv
+- Tests
+- More vcs options
+- More pip options
+- All Juju's generated django config files have there priority set to 60
+
+New options:
+
+- wsgi_log_dir
+
+Backwards incompatible changes:
+
+- unit-config was renamed unit_config
+- django_allowed_hosts needs commas as separators instead of spaces
+- rename repos_dir for vcs_clone_dir because of a name collision with juju
+
+### 6: Notable changes:
+
+- The charm now use charm-helpers for hooks
+- The chams now use ansible for installation
+- Mysql and Redis and rabbitmq (celery) support was added
+- The charm can install South and do migrations
+- The charm include a Fabric and Ansible scripts to interact with Juju
+
+Note that I still need to think about the role of Fabric, Ansible, Salt, charm-helpers, etc
+
+Configuration changes:
+
+- python_path now accept multiple path separated by commas
+- requirements_pip_files now also accept urls
+- requirements_pip_files and requirements_apt_files are empty by default
+- settings_secret_key_path was renamed settings_secret_key_name
+- settings_database_path was renamed settings_database_name
+
+New options:
+
+- unit-config
+- settings_amqp_name
+- celery_always_eager
+- django_south
+- django_south_version
+- django_debug
+- django_allowed_host
+- django_extra_settings
+- settings_injection_path
+- url_injection_path
+- pip_extra_args
+
+Backwards incompatible changes:
+
+- Some default options changed so be sure to checkout your configuration files.
+- The use of Ansible change a bit how things are done now be sure to test.
+
 ### 3: Notable changes:
 
 - Rewrite the charm using python instead of BASH scripts

=== added file 'ansible.py'
--- ansible.py	1970-01-01 00:00:00 +0000
+++ ansible.py	2014-07-07 20:28:28 +0000
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+import sys
+from subprocess import Popen, PIPE
+
+import yaml
+import json
+
+
+d = yaml.safe_load(Popen(['juju','status'],stdout=PIPE).stdout)
+
+services = d.get("services", {})
+if services is None:
+    sys.exit(0)
+
+groups = {}
+for service in services.items():
+    if service is None:
+        continue
+
+    units = services.get(service[0], {}).get("units", {})
+    if units is None:
+        continue
+
+    for unit in units.items():
+        if 'public-address' in unit[1].keys():
+            groups.setdefault(service[0], {"hosts" :[]})['hosts'].append(unit[1]['public-address'])
+
+print json.dumps(groups)

=== added directory 'bin'
=== added file 'bin/charm_helpers_sync.py'
--- bin/charm_helpers_sync.py	1970-01-01 00:00:00 +0000
+++ bin/charm_helpers_sync.py	2014-07-07 20:28:28 +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 file 'charm-helpers.yaml'
--- charm-helpers.yaml	1970-01-01 00:00:00 +0000
+++ charm-helpers.yaml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,7 @@
+branch: lp:charm-helpers
+destination: hooks/charmhelpers
+include:
+    - core
+    - fetch
+    - contrib.ansible|inc=*
+    - contrib.templating.contexts

=== modified file 'config.yaml'
--- config.yaml	2013-05-31 15:04:04 +0000
+++ config.yaml	2014-07-07 20:28:28 +0000
@@ -6,6 +6,12 @@
           The web site secret key. Leave empty will generate one.
           NOTE: You **NEED** to set this in a multi-units architecture or you will
           have some trouble.
+    django_uid:
+        type: string
+        default: "www-data"
+    django_gid:
+        type: string
+        default: "www-data"
     django_version:
         type: string
         default: "distro"
@@ -13,6 +19,7 @@
           Version or origin from which to install.  May be one of the following:
           distro (default), ppa:somecustom/ppa, a deb url sources entry or
           a valid pip line like 'Django' or 'Django==1.5' or a reposiroty url (without the -e).
+          Leaving it empty if you don't want the charm to install Django.
     vcs:
         type: string
         default: ""
@@ -73,6 +80,14 @@
         description: |
           The relative path to install_root where the manage.py
           script is located.
+    unit_config:
+        type: string
+        default: ""
+        description: |
+          base64 encoded string to hold configuration information for the unit.
+          The contents will be written to a file named
+           <install_root>/<unit>/unit_config
+          where <unit> is the location the branch is extracted to.
     additional_distro_packages:
         type: string
         default: "python-imaging,python-docutils,python-tz"
@@ -85,47 +100,109 @@
           Comma separated extra packages to install.
     requirements_pip_files:
         type: string
-        default: "requirements.txt,requirements.pip"
+        default: ""
         description: |
-          Comma separated relative paths to requirement files. Note that the charm
+          Comma separated relative paths or urls to a requirement files. Note that the charm
           won't manually upgrade packages defined in this file.
-          Set the variable to an empty string if you don't want the feature.
+          Leave the variable to an empty string if you don't want the feature.
+    pip_extra_args:
+        type: string
+        default: ""
+        description: |
+          Extra arguments passed to pip.
     requirements_apt_files:
         type: string
-        default: "requirements.apt"
+        default: ""
         description: |
           Comma separated relative paths to requirement files. Note that the charm
           won't manually upgrade packages defined in this file.
-          Set the variable to an empty string if you don't want the feature.
+          Leave the variable to an empty string if you don't want the feature.
     django_settings:
         type: string
-        default: "settings"
+        default: ""
         description: |
           The Python path to your Django settings module.
+          Leave it empty if your settings file is at the root of your repos.
+    django_south:
+        type: boolean
+        default: False
+        description: |
+          Enable the use of south migrations
+    django_south_version:
+        type: string
+        default: "distro"
+        description: |
+          Version or origin from which to install.  May be one of the following:
+          distro (default), ppa:somecustom/ppa, a deb url sources entry or
+          a valid pip line like 'South' or 'South==0.8.4' or a reposiroty url (without the -e).
+          Leaving it empty if you don't want the charm to install South.
+    django_debug:
+        type: boolean
+        default: False
+        description: |
+          Enable disable settings.DEBUG for django
+    django_allowed_hosts:
+        type: string
+        default: ""
+        description: |
+          A comma separated list for settings.ALLOWED_HOSTS in django. Default
+          value will be the hostname, fully-qualified name, and public IP.
+    django_extra_settings:
+        type: string
+        default: ""
+        description: |
+          Allows setting up extra settings.* values for Django. Acceptable
+          values are limited to comma delimited key-value pairs like:
+            SETTING_X=foo, SETTING_Y=bar
     urls_dir_name:
         type: string
         default: "juju_urls"
         description: |
-          The place where the generated urls will be written.
+          The name of the directory where generated url will be written.
           Set the variable to an empty string if you don't want the feature.
+    urls_injection_path:
+        type: string
+        default: "urls.py"
+        description: |
+          The place where the code injection path will be append.
+          This is relative to the urls_dir_name path define earlier.
     settings_dir_name:
         type: string
         default: "juju_settings"
         description: |
-          The place where the generated settings will be written.
+          The name of the directory where generated settings will be written.
           Set the variable to an empty string if you don't want the feature.
-    settings_database_path:
-        type: string
-        default: "juju_settings/20-engine-%(engine_name)s.py"
+    settings_injection_path:
+        type: string
+        default: "settings.py"
+        description: |
+          The place where the code injection path will be append.
+          This is relative to the settings_dir_name path define earlier.
+    settings_database_name:
+        type: string
+        default: "60-engine-%(engine_name)s.py"
         description: |
           The place where the database configuration will be appended or written.
           Set the variable to an empty string if you don't want the feature.
-    settings_secret_key_path:
+    settings_secret_key_name:
         type: string
-        default: "juju_settings/10-secret.py"
+        default: "60-secret.py"
         description: |
           The place where the secret key configuration will be appended or written.
           Set the variable to an empty string if you don't want the feature.
+    settings_amqp_name:
+        type: string
+        default: "60-amqp.py"
+        description: |
+          The place where the amqp configuration will be appended or written.
+    celery_always_eager:
+        type: string
+        default: "False"
+        description: If True, all tasks will be executed locally by blocking until the task returns.
+    celery_amqp_vhost:
+        type: string
+        default: ""
+        description: Set a specific vhost for amqp relation. By default it's the unit_name.
     wsgi_wsgi_file:
         type: string
         default: "wsgi"
@@ -136,11 +213,11 @@
         description: "The number of worker process for handling requests. 0 for count(cpu) + 1"
     wsgi_worker_class:
         type: string
-        default: "sync"
-        description: "Gunicorn workers type. Can be: sync, eventlet, gevent, tornado"
+        default: ""
+        description: "Socket protocol. Can be: http (default), uwsgi, fastcgi or workers type. Can be: sync (default), eventlet, gevent, tornado"
     wsgi_worker_connections:
         type: int
-        default: 1000
+        default: 128
         description: "The maximum number of simultaneous clients."
     wsgi_max_requests:
         type: int
@@ -160,8 +237,8 @@
         description: "Keep alive time in seconds."
     wsgi_umask:
         type: string
-        default: "0"
-        description: "A bit mask for the file mode on files written by Gunicorn. The number 0 means Python guesses the base. Note that this affects unix socket permissions."
+        default: "0002"
+        description: "A bit mask for the file mode on files written."
     wsgi_user:
         type: string
         default: "www-data"
@@ -172,7 +249,7 @@
         description: "Switch worker process to run as this group. A valid group id (as an int) or the name."
     wsgi_log_file:
         type: string
-        default: "-"
+        default: ""
         description: "The log file to write to. If empty the logs would be handle by upstart."
     wsgi_log_level:
         type: string
@@ -193,15 +270,15 @@
     wsgi_timestamp:
         type: string
         default: ""
-        description: "The variable to modify to trigger Gunicorn reload."
+        description: "The variable to modify to trigger reloads."
     python_path:
         type: string
         default: ""
-        description: "Set an additionnal PYTHONPATH to the project."
+        description: "Set additionnals, colon separated, PYTHONPATH to the project."
     listen_ip:
         type: string
         default: "0.0.0.0"
-        description: "IP adresses that Gunicorn will listen on. By default we listen on all of them."
+        description: "IP adresses to listen on. By default we listen on all of them."
     port:
         type: int
         default: 8080

=== added directory 'dev'
=== added file 'dev/ubuntu-deps'
--- dev/ubuntu-deps	1970-01-01 00:00:00 +0000
+++ dev/ubuntu-deps	2014-07-07 20:28:28 +0000
@@ -0,0 +1,17 @@
+#!/bin/bash -e
+# Needs to be run as a user who can sudo.  d'oh!
+# It will ask your password a lot.
+
+# Install add-apt-repository (packaging differs across releases).
+lsb_release -r | grep -q 12.04 \
+    && sudo apt-get -y install python-software-properties \
+    || sudo apt-get -y install software-properties-common
+
+# Add the juju stable ppa, install charm-tools (juju-test plugin) and other deps
+sudo add-apt-repository -y ppa:juju/stable
+sudo apt-get update
+sudo apt-get -y install juju-deployer juju-core charm-tools python3 python3-yaml
+
+# python3-flake8 was introduced after 12.04. Releases prior to that are not
+# supported.
+lsb_release -r | grep -q 12.04 || sudo apt-get -y install python3-flake8

=== modified file 'fabfile.py'
--- fabfile.py	2013-05-29 18:52:19 +0000
+++ fabfile.py	2014-07-07 20:28:28 +0000
@@ -7,8 +7,14 @@
 import yaml
 
 from fabric.api import env, run, sudo, task, put
-from fabric.context_managers import cd
+from fabric.context_managers import cd, shell_env
 from fabric.contrib import files
+from fabric.state import output
+
+# Be quiet by default
+env.output_prefix = ''
+output['running'] = False
+output['status'] = False
 
 
 # helpers
@@ -24,8 +30,8 @@
 def _config_get(service_name):
     yaml_conf = Popen(['juju', 'get', service_name], stdout=PIPE)
     conf = yaml.safe_load(yaml_conf.stdout)
-    orig_conf = yaml.safe_load(open('config.yaml', 'r'))['options']
-    return {k: (v['value'] if v['value'] is not None else orig_conf[k]['default']) for k,v in conf['settings'].iteritems()}
+    return {k: (v['value'] if 'value' in v else v['default']) for k,v in conf['settings'].iteritems()}
+
 
 def _find_django_admin_cmd():
     for cmd in ['django-admin.py', 'django-admin']:
@@ -39,7 +45,7 @@
 # Initialisation
 env.user = 'ubuntu'
 
-d = yaml.safe_load(Popen(['juju','status'],stdout=PIPE).stdout)
+d = yaml.safe_load(Popen(['juju', 'status'], stdout=PIPE).stdout)
 
 services = d.get("services", {})
 if services is None:
@@ -59,12 +65,29 @@
             env.roledefs.setdefault(service[0], []).append(unit[1]['public-address'])
             env.roledefs.setdefault(unit[0], []).append(unit[1]['public-address'])
 
+if not env.roles:
+    print "You must select a charm or a unit with the -R option to perform a task"
+    print "Charms: %s" % [role for role in env.roledefs.keys() if not '/' in role]
+    print "Units: %s" % [host for host in env.roledefs.keys() if '/' in host]
+    print
+else:
+    env.service_name = env.roles[0].split('/')[0]
+    env.sanitized_service_name = _sanitize(env.service_name)
+    env.conf = _config_get(env.service_name)
+    if not env.conf['django_settings']:
+        django_settings_modules = '.'.join([env.sanitized_service_name, 'settings'])
+        if env.conf['application_path']:
+            django_settings_modules = '.'.join([os.path.basename(env.conf['application_path']),
+                                                'settings'])
+    else:
+        django_settings_modules = env.conf['django_settings']
 
-env.service_name = env.roles[0].split('/')[0]
-env.sanitized_service_name = _sanitize(env.service_name)
-env.conf = _config_get(env.service_name)
-env.project_dir = os.path.join(env.conf['install_root'], env.sanitized_service_name)
-env.django_settings_modules = '.'.join([env.sanitized_service_name, env.conf['django_settings']])
+    env.project_dir = os.path.join(env.conf['install_root'], env.sanitized_service_name)
+    env.site_path = os.path.join(env.project_dir, env.conf['application_path'])
+    if env.conf['python_path']:
+        env.python_path = ':'.join([env.conf['install_root'], env.conf['python_path'].replace(',', ':')])
+    else:
+        env.python_path = env.conf['install_root']
 
 
 # Debian
@@ -75,6 +98,7 @@
     """
     sudo('apt-get install -y %s' % packages)
 
+
 @task
 def apt_update():
     """
@@ -82,6 +106,7 @@
     """
     sudo('apt-get update')
 
+
 @task
 def apt_dist_upgrade():
     """
@@ -89,6 +114,7 @@
     """
     sudo('apt-get dist-upgrade -y')
 
+
 @task
 def apt_install_r():
     """
@@ -98,7 +124,8 @@
         for req_file in env.conf['requirements_apt_files'].split(','):
             sudo("apt-get install -y $(cat %s | tr '\\n' ' '" % req_file)
 
-# Python
+
+# Pip
 @task
 def pip_install(packages):
     """
@@ -106,6 +133,7 @@
     """
     sudo("pip install %s" % packages)
 
+
 @task
 def pip_install_r():
     """
@@ -115,6 +143,15 @@
         for req_file in env.conf['requirements_pip_files'].split(','):
             sudo("pip install -r %s" % req_file)
 
+
+@task
+def pip_freeze():
+    """
+    List installed python packages
+    """
+    sudo("pip freeze")
+
+
 # Users
 @task
 def adduser(username):
@@ -123,22 +160,6 @@
     """
     sudo('adduser %s --disabled-password --gecos ""' % username)
 
-@task
-def ssh_add_key(pub_key_file, username=None):
-    """
-    Add a public SSH key to the authorized_keys file on the remote machine.
-    """
-    with open(os.path.normpath(pub_key_file), 'rt') as f:
-        ssh_key = f.read()
-
-    if username is None:
-        run('mkdir -p .ssh')
-        files.append('.ssh/authorized_keys', ssh_key)
-    else:
-        run('mkdir -p /home/%s/.ssh' % username)
-        files.append('/home/%s/.ssh/authorized_keys' % username, ssh_key)
-        run('chown -R %s:%s /home/%s/.ssh' % (username, username, username))
-
 
 # VCS
 
@@ -175,9 +196,13 @@
 def manage(command):
     """ Runs management commands."""
     django_admin_cmd = _find_django_admin_cmd()
-    sudo('%s %s --pythonpath=%s --settings=%s' % \
-      (django_admin_cmd, command, env.conf['install_root'], env.django_settings_modules), \
-         user=env.conf['wsgi_user'])
+
+    with cd(env.site_path):
+        with shell_env(PYTHONPATH=':'.join([os.path.join(env.site_path, '../'), env.python_path])):
+            sudo('%s %s --settings=%s' %
+                (django_admin_cmd, command, django_settings_modules),
+                 user=env.conf['wsgi_user'])
+
 
 @task
 def load_fixture(fixture_path):
@@ -187,11 +212,11 @@
     manage('loaddata %s' % os.path.join('/tmp/', fixture_file))
     run('rm %s' % os.path.join('/tmp/', fixture_file))
 
+
 # Utils
 @task
 def delete_pyc():
     """ Deletes *.pyc files from project source dir """
-
-    with env.project_dir:
-        run("find . -name '*.pyc' -delete")
- 
+    with cd(env.project_dir):
+        sudo("find . -name '*.pyc' -delete", user="www-data")
+        reload()

=== added symlink 'hooks/amqp-relation-broken'
=== target is u'hooks.py'
=== added symlink 'hooks/amqp-relation-changed'
=== target is u'hooks.py'
=== added symlink 'hooks/amqp-relation-joined'
=== target is u'hooks.py'
=== added directory 'hooks/charmhelpers'
=== added file 'hooks/charmhelpers/__init__.py'
=== added directory 'hooks/charmhelpers/contrib'
=== added file 'hooks/charmhelpers/contrib/__init__.py'
=== added directory 'hooks/charmhelpers/contrib/ansible'
=== added file 'hooks/charmhelpers/contrib/ansible/__init__.py'
--- hooks/charmhelpers/contrib/ansible/__init__.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/ansible/__init__.py	2014-07-07 20:28:28 +0000
@@ -0,0 +1,165 @@
+# Copyright 2013 Canonical Ltd.
+#
+# Authors:
+#  Charm Helpers Developers <[e-mail]>
+"""Charm Helpers ansible - declare the state of your machines.
+
+This helper enables you to declare your machine state, rather than
+program it procedurally (and have to test each change to your procedures).
+Your install hook can be as simple as:
+
+{{{
+import charmhelpers.contrib.ansible
+
+
+def install():
+    charmhelpers.contrib.ansible.install_ansible_support()
+    charmhelpers.contrib.ansible.apply_playbook('playbooks/install.yaml')
+}}}
+
+and won't need to change (nor will its tests) when you change the machine
+state.
+
+All of your juju config and relation-data are available as template
+variables within your playbooks and templates. An install playbook looks
+something like:
+
+{{{
+---
+- hosts: localhost
+  user: root
+
+  tasks:
+    - name: Add private repositories.
+      template:
+        src: ../templates/private-repositories.list.jinja2
+        dest: /etc/apt/sources.list.d/private.list
+
+    - name: Update the cache.
+      apt: update_cache=yes
+
+    - name: Install dependencies.
+      apt: pkg={{ item }}
+      with_items:
+        - python-mimeparse
+        - python-webob
+        - sunburnt
+
+    - name: Setup groups.
+      group: name={{ item.name }} gid={{ item.gid }}
+      with_items:
+        - { name: 'deploy_user', gid: 1800 }
+        - { name: 'service_user', gid: 1500 }
+
+  ...
+}}}
+
+Read more online about playbooks[1] and standard ansible modules[2].
+
+[1] http://www.ansibleworks.com/docs/playbooks.html
+[2] http://www.ansibleworks.com/docs/modules.html
+"""
+import os
+import subprocess
+
+import charmhelpers.contrib.templating.contexts
+import charmhelpers.core.host
+import charmhelpers.core.hookenv
+import charmhelpers.fetch
+
+
+charm_dir = os.environ.get('CHARM_DIR', '')
+ansible_hosts_path = '/etc/ansible/hosts'
+# Ansible will automatically include any vars in the following
+# file in its inventory when run locally.
+ansible_vars_path = '/etc/ansible/host_vars/localhost'
+
+
+def install_ansible_support(from_ppa=True):
+    """Installs the ansible package.
+
+    By default it is installed from the PPA [1] linked from
+    the ansible website [2].
+
+    [1] https://launchpad.net/~rquillo/+archive/ansible
+    [2] http://www.ansibleworks.com/docs/gettingstarted.html#ubuntu-and-debian
+
+    If from_ppa is false, you must ensure that the package is available
+    from a configured repository.
+    """
+    if from_ppa:
+        charmhelpers.fetch.add_source('ppa:rquillo/ansible')
+        charmhelpers.fetch.apt_update(fatal=True)
+    charmhelpers.fetch.apt_install('ansible')
+    with open(ansible_hosts_path, 'w+') as hosts_file:
+        hosts_file.write('localhost ansible_connection=local')
+
+
+def apply_playbook(playbook, tags=None):
+    tags = tags or []
+    tags = ",".join(tags)
+    charmhelpers.contrib.templating.contexts.juju_state_to_yaml(
+        ansible_vars_path, namespace_separator='__',
+        allow_hyphens_in_keys=False)
+    call = [
+        'ansible-playbook',
+        '-c',
+        'local',
+        playbook,
+    ]
+    if tags:
+        call.extend(['--tags', '{}'.format(tags)])
+    subprocess.check_call(call)
+
+
+class AnsibleHooks(charmhelpers.core.hookenv.Hooks):
+    """Run a playbook with the hook-name as the tag.
+
+    This helper builds on the standard hookenv.Hooks helper,
+    but additionally runs the playbook with the hook-name specified
+    using --tags (ie. running all the tasks tagged with the hook-name).
+
+    Example:
+        hooks = AnsibleHooks(playbook_path='playbooks/my_machine_state.yaml')
+
+        # All the tasks within my_machine_state.yaml tagged with 'install'
+        # will be run automatically after do_custom_work()
+        @hooks.hook()
+        def install():
+            do_custom_work()
+
+        # For most of your hooks, you won't need to do anything other
+        # than run the tagged tasks for the hook:
+        @hooks.hook('config-changed', 'start', 'stop')
+        def just_use_playbook():
+            pass
+
+        # As a convenience, you can avoid the above noop function by specifying
+        # the hooks which are handled by ansible-only and they'll be registered
+        # for you:
+        # hooks = AnsibleHooks(
+        #     'playbooks/my_machine_state.yaml',
+        #     default_hooks=['config-changed', 'start', 'stop'])
+
+        if __name__ == "__main__":
+            # execute a hook based on the name the program is called by
+            hooks.execute(sys.argv)
+    """
+
+    def __init__(self, playbook_path, default_hooks=None):
+        """Register any hooks handled by ansible."""
+        super(AnsibleHooks, self).__init__()
+
+        self.playbook_path = playbook_path
+
+        default_hooks = default_hooks or []
+        noop = lambda *args, **kwargs: None
+        for hook in default_hooks:
+            self.register(hook, noop)
+
+    def execute(self, args):
+        """Execute the hook followed by the playbook using the hook as tag."""
+        super(AnsibleHooks, self).execute(args)
+        hook_name = os.path.basename(args[0])
+        charmhelpers.contrib.ansible.apply_playbook(
+            self.playbook_path, tags=[hook_name])

=== added directory 'hooks/charmhelpers/contrib/templating'
=== added file 'hooks/charmhelpers/contrib/templating/__init__.py'
=== added file 'hooks/charmhelpers/contrib/templating/contexts.py'
--- hooks/charmhelpers/contrib/templating/contexts.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/contrib/templating/contexts.py	2014-07-07 20:28:28 +0000
@@ -0,0 +1,104 @@
+# Copyright 2013 Canonical Ltd.
+#
+# Authors:
+#  Charm Helpers Developers <[e-mail]>
+"""A helper to create a yaml cache of config with namespaced relation data."""
+import os
+import yaml
+
+import charmhelpers.core.hookenv
+
+
+charm_dir = os.environ.get('CHARM_DIR', '')
+
+
+def dict_keys_without_hyphens(a_dict):
+    """Return the a new dict with underscores instead of hyphens in keys."""
+    return dict(
+        (key.replace('-', '_'), val) for key, val in a_dict.items())
+
+
+def update_relations(context, namespace_separator=':'):
+    """Update the context with the relation data."""
+    # Add any relation data prefixed with the relation type.
+    relation_type = charmhelpers.core.hookenv.relation_type()
+    relations = []
+    context['current_relation'] = {}
+    if relation_type is not None:
+        relation_data = charmhelpers.core.hookenv.relation_get()
+        context['current_relation'] = relation_data
+        # Deprecated: the following use of relation data as keys
+        # directly in the context will be removed.
+        relation_data = dict(
+            ("{relation_type}{namespace_separator}{key}".format(
+                relation_type=relation_type,
+                key=key,
+                namespace_separator=namespace_separator), val)
+            for key, val in relation_data.items())
+        relation_data = dict_keys_without_hyphens(relation_data)
+        context.update(relation_data)
+        relations = charmhelpers.core.hookenv.relations_of_type(relation_type)
+        relations = [dict_keys_without_hyphens(rel) for rel in relations]
+
+    if 'relations_deprecated' not in context:
+        context['relations_deprecated'] = {}
+    if relation_type is not None:
+        relation_type = relation_type.replace('-', '_')
+        context['relations_deprecated'][relation_type] = relations
+
+    context['relations'] = charmhelpers.core.hookenv.relations()
+
+
+def juju_state_to_yaml(yaml_path, namespace_separator=':',
+                       allow_hyphens_in_keys=True):
+    """Update the juju config and state in a yaml file.
+
+    This includes any current relation-get data, and the charm
+    directory.
+
+    This function was created for the ansible and saltstack
+    support, as those libraries can use a yaml file to supply
+    context to templates, but it may be useful generally to
+    create and update an on-disk cache of all the config, including
+    previous relation data.
+
+    By default, hyphens are allowed in keys as this is supported
+    by yaml, but for tools like ansible, hyphens are not valid [1].
+
+    [1] http://www.ansibleworks.com/docs/playbooks_variables.html#what-makes-a-valid-variable-name
+    """
+    config = charmhelpers.core.hookenv.config()
+
+    # Add the charm_dir which we will need to refer to charm
+    # file resources etc.
+    config['charm_dir'] = charm_dir
+    config['local_unit'] = charmhelpers.core.hookenv.local_unit()
+    config['unit_private_address'] = charmhelpers.core.hookenv.unit_private_ip()
+    config['unit_public_address'] = charmhelpers.core.hookenv.unit_get(
+        'public-address'
+    )
+
+    # Don't use non-standard tags for unicode which will not
+    # work when salt uses yaml.load_safe.
+    yaml.add_representer(unicode, lambda dumper,
+                         value: dumper.represent_scalar(
+                             u'tag:yaml.org,2002:str', value))
+
+    yaml_dir = os.path.dirname(yaml_path)
+    if not os.path.exists(yaml_dir):
+        os.makedirs(yaml_dir)
+
+    if os.path.exists(yaml_path):
+        with open(yaml_path, "r") as existing_vars_file:
+            existing_vars = yaml.load(existing_vars_file.read())
+    else:
+        existing_vars = {}
+
+    if not allow_hyphens_in_keys:
+        config = dict_keys_without_hyphens(config)
+    existing_vars.update(config)
+
+    update_relations(existing_vars, namespace_separator)
+
+    with open(yaml_path, "w+") as fp:
+        fp.write(yaml.dump(existing_vars, default_flow_style=False))

=== added directory 'hooks/charmhelpers/core'
=== added file 'hooks/charmhelpers/core/__init__.py'
=== added file 'hooks/charmhelpers/core/fstab.py'
--- hooks/charmhelpers/core/fstab.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/core/fstab.py	2014-07-07 20:28:28 +0000
@@ -0,0 +1,114 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__author__ = 'Jorge Niedbalski R. <[e-mail]>'
+
+import os
+
+
+class Fstab(file):
+    """This class extends file in order to implement a file reader/writer
+    for file `/etc/fstab`
+    """
+
+    class Entry(object):
+        """Entry class represents a non-comment line on the `/etc/fstab` file
+        """
+        def __init__(self, device, mountpoint, filesystem,
+                     options, d=0, p=0):
+            self.device = device
+            self.mountpoint = mountpoint
+            self.filesystem = filesystem
+
+            if not options:
+                options = "defaults"
+
+            self.options = options
+            self.d = d
+            self.p = p
+
+        def __eq__(self, o):
+            return str(self) == str(o)
+
+        def __str__(self):
+            return "{} {} {} {} {} {}".format(self.device,
+                                              self.mountpoint,
+                                              self.filesystem,
+                                              self.options,
+                                              self.d,
+                                              self.p)
+
+    DEFAULT_PATH = os.path.join(os.path.sep, 'etc', 'fstab')
+
+    def __init__(self, path=None):
+        if path:
+            self._path = path
+        else:
+            self._path = self.DEFAULT_PATH
+        file.__init__(self, self._path, 'r+')
+
+    def _hydrate_entry(self, line):
+        return Fstab.Entry(*filter(
+            lambda x: x not in ('', None),
+            line.strip("\n").split(" ")))
+
+    @property
+    def entries(self):
+        self.seek(0)
+        for line in self.readlines():
+            try:
+                if not line.startswith("#"):
+                    yield self._hydrate_entry(line)
+            except ValueError:
+                pass
+
+    def get_entry_by_attr(self, attr, value):
+        for entry in self.entries:
+            e_attr = getattr(entry, attr)
+            if e_attr == value:
+                return entry
+        return None
+
+    def add_entry(self, entry):
+        if self.get_entry_by_attr('device', entry.device):
+            return False
+
+        self.write(str(entry) + '\n')
+        self.truncate()
+        return entry
+
+    def remove_entry(self, entry):
+        self.seek(0)
+
+        lines = self.readlines()
+
+        found = False
+        for index, line in enumerate(lines):
+            if not line.startswith("#"):
+                if self._hydrate_entry(line) == entry:
+                    found = True
+                    break
+
+        if not found:
+            return False
+
+        lines.remove(line)
+
+        self.seek(0)
+        self.write(''.join(lines))
+        self.truncate()
+        return True
+
+    @classmethod
+    def remove_by_mountpoint(cls, mountpoint, path=None):
+        fstab = cls(path=path)
+        entry = fstab.get_entry_by_attr('mountpoint', mountpoint)
+        if entry:
+            return fstab.remove_entry(entry)
+        return False
+
+    @classmethod
+    def add(cls, device, mountpoint, filesystem, options=None, path=None):
+        return cls(path=path).add_entry(Fstab.Entry(device,
+                                                    mountpoint, filesystem,
+                                                    options=options))

=== added file 'hooks/charmhelpers/core/hookenv.py'
--- hooks/charmhelpers/core/hookenv.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/core/hookenv.py	2014-07-07 20:28:28 +0000
@@ -0,0 +1,498 @@
+"Interactions with the Juju environment"
+# Copyright 2013 Canonical Ltd.
+#
+# Authors:
+#  Charm Helpers Developers <[e-mail]>
+
+import os
+import json
+import yaml
+import subprocess
+import sys
+import UserDict
+from subprocess import CalledProcessError
+
+CRITICAL = "CRITICAL"
+ERROR = "ERROR"
+WARNING = "WARNING"
+INFO = "INFO"
+DEBUG = "DEBUG"
+MARKER = object()
+
+cache = {}
+
+
+def cached(func):
+    """Cache return values for multiple executions of func + args
+
+    For example:
+
+        @cached
+        def unit_get(attribute):
+            pass
+
+        unit_get('test')
+
+    will cache the result of unit_get + 'test' for future calls.
+    """
+    def wrapper(*args, **kwargs):
+        global cache
+        key = str((func, args, kwargs))
+        try:
+            return cache[key]
+        except KeyError:
+            res = func(*args, **kwargs)
+            cache[key] = res
+            return res
+    return wrapper
+
+
+def flush(key):
+    """Flushes any entries from function cache where the
+    key is found in the function+args """
+    flush_list = []
+    for item in cache:
+        if key in item:
+            flush_list.append(item)
+    for item in flush_list:
+        del cache[item]
+
+
+def log(message, level=None):
+    """Write a message to the juju log"""
+    command = ['juju-log']
+    if level:
+        command += ['-l', level]
+    command += [message]
+    subprocess.call(command)
+
+
+class Serializable(UserDict.IterableUserDict):
+    """Wrapper, an object that can be serialized to yaml or json"""
+
+    def __init__(self, obj):
+        # wrap the object
+        UserDict.IterableUserDict.__init__(self)
+        self.data = obj
+
+    def __getattr__(self, attr):
+        # See if this object has attribute.
+        if attr in ("json", "yaml", "data"):
+            return self.__dict__[attr]
+        # Check for attribute in wrapped object.
+        got = getattr(self.data, attr, MARKER)
+        if got is not MARKER:
+            return got
+        # Proxy to the wrapped object via dict interface.
+        try:
+            return self.data[attr]
+        except KeyError:
+            raise AttributeError(attr)
+
+    def __getstate__(self):
+        # Pickle as a standard dictionary.
+        return self.data
+
+    def __setstate__(self, state):
+        # Unpickle into our wrapper.
+        self.data = state
+
+    def json(self):
+        """Serialize the object to json"""
+        return json.dumps(self.data)
+
+    def yaml(self):
+        """Serialize the object to yaml"""
+        return yaml.dump(self.data)
+
+
+def execution_environment():
+    """A convenient bundling of the current execution context"""
+    context = {}
+    context['conf'] = config()
+    if relation_id():
+        context['reltype'] = relation_type()
+        context['relid'] = relation_id()
+        context['rel'] = relation_get()
+    context['unit'] = local_unit()
+    context['rels'] = relations()
+    context['env'] = os.environ
+    return context
+
+
+def in_relation_hook():
+    """Determine whether we're running in a relation hook"""
+    return 'JUJU_RELATION' in os.environ
+
+
+def relation_type():
+    """The scope for the current relation hook"""
+    return os.environ.get('JUJU_RELATION', None)
+
+
+def relation_id():
+    """The relation ID for the current relation hook"""
+    return os.environ.get('JUJU_RELATION_ID', None)
+
+
+def local_unit():
+    """Local unit ID"""
+    return os.environ['JUJU_UNIT_NAME']
+
+
+def remote_unit():
+    """The remote unit for the current relation hook"""
+    return os.environ['JUJU_REMOTE_UNIT']
+
+
+def service_name():
+    """The name service group this unit belongs to"""
+    return local_unit().split('/')[0]
+
+
+def hook_name():
+    """The name of the currently executing hook"""
+    return os.path.basename(sys.argv[0])
+
+
+class Config(dict):
+    """A Juju charm config dictionary that can write itself to
+    disk (as json) and track which values have changed since
+    the previous hook invocation.
+
+    Do not instantiate this object directly - instead call
+    ``hookenv.config()``
+
+    Example usage::
+
+        >>> # inside a hook
+        >>> from charmhelpers.core import hookenv
+        >>> config = hookenv.config()
+        >>> config['foo']
+        'bar'
+        >>> config['mykey'] = 'myval'
+        >>> config.save()
+
+
+        >>> # user runs `juju set mycharm foo=baz`
+        >>> # now we're inside subsequent config-changed hook
+        >>> config = hookenv.config()
+        >>> config['foo']
+        'baz'
+        >>> # test to see if this val has changed since last hook
+        >>> config.changed('foo')
+        True
+        >>> # what was the previous value?
+        >>> config.previous('foo')
+        'bar'
+        >>> # keys/values that we add are preserved across hooks
+        >>> config['mykey']
+        'myval'
+        >>> # don't forget to save at the end of hook!
+        >>> config.save()
+
+    """
+    CONFIG_FILE_NAME = '.juju-persistent-config'
+
+    def __init__(self, *args, **kw):
+        super(Config, self).__init__(*args, **kw)
+        self._prev_dict = None
+        self.path = os.path.join(charm_dir(), Config.CONFIG_FILE_NAME)
+        if os.path.exists(self.path):
+            self.load_previous()
+
+    def load_previous(self, path=None):
+        """Load previous copy of config from disk so that current values
+        can be compared to previous values.
+
+        :param path:
+
+            File path from which to load the previous config. If `None`,
+            config is loaded from the default location. If `path` is
+            specified, subsequent `save()` calls will write to the same
+            path.
+
+        """
+        self.path = path or self.path
+        with open(self.path) as f:
+            self._prev_dict = json.load(f)
+
+    def changed(self, key):
+        """Return true if the value for this key has changed since
+        the last save.
+
+        """
+        if self._prev_dict is None:
+            return True
+        return self.previous(key) != self.get(key)
+
+    def previous(self, key):
+        """Return previous value for this key, or None if there
+        is no "previous" value.
+
+        """
+        if self._prev_dict:
+            return self._prev_dict.get(key)
+        return None
+
+    def save(self):
+        """Save this config to disk.
+
+        Preserves items in _prev_dict that do not exist in self.
+
+        """
+        if self._prev_dict:
+            for k, v in self._prev_dict.iteritems():
+                if k not in self:
+                    self[k] = v
+        with open(self.path, 'w') as f:
+            json.dump(self, f)
+
+
+@cached
+def config(scope=None):
+    """Juju charm configuration"""
+    config_cmd_line = ['config-get']
+    if scope is not None:
+        config_cmd_line.append(scope)
+    config_cmd_line.append('--format=json')
+    try:
+        config_data = json.loads(subprocess.check_output(config_cmd_line))
+        if scope is not None:
+            return config_data
+        return Config(config_data)
+    except ValueError:
+        return None
+
+
+@cached
+def relation_get(attribute=None, unit=None, rid=None):
+    """Get relation information"""
+    _args = ['relation-get', '--format=json']
+    if rid:
+        _args.append('-r')
+        _args.append(rid)
+    _args.append(attribute or '-')
+    if unit:
+        _args.append(unit)
+    try:
+        return json.loads(subprocess.check_output(_args))
+    except ValueError:
+        return None
+    except CalledProcessError, e:
+        if e.returncode == 2:
+            return None
+        raise
+
+
+def relation_set(relation_id=None, relation_settings={}, **kwargs):
+    """Set relation information for the current unit"""
+    relation_cmd_line = ['relation-set']
+    if relation_id is not None:
+        relation_cmd_line.extend(('-r', relation_id))
+    for k, v in (relation_settings.items() + kwargs.items()):
+        if v is None:
+            relation_cmd_line.append('{}='.format(k))
+        else:
+            relation_cmd_line.append('{}={}'.format(k, v))
+    subprocess.check_call(relation_cmd_line)
+    # Flush cache of any relation-gets for local unit
+    flush(local_unit())
+
+
+@cached
+def relation_ids(reltype=None):
+    """A list of relation_ids"""
+    reltype = reltype or relation_type()
+    relid_cmd_line = ['relation-ids', '--format=json']
+    if reltype is not None:
+        relid_cmd_line.append(reltype)
+        return json.loads(subprocess.check_output(relid_cmd_line)) or []
+    return []
+
+
+@cached
+def related_units(relid=None):
+    """A list of related units"""
+    relid = relid or relation_id()
+    units_cmd_line = ['relation-list', '--format=json']
+    if relid is not None:
+        units_cmd_line.extend(('-r', relid))
+    return json.loads(subprocess.check_output(units_cmd_line)) or []
+
+
+@cached
+def relation_for_unit(unit=None, rid=None):
+    """Get the json represenation of a unit's relation"""
+    unit = unit or remote_unit()
+    relation = relation_get(unit=unit, rid=rid)
+    for key in relation:
+        if key.endswith('-list'):
+            relation[key] = relation[key].split()
+    relation['__unit__'] = unit
+    return relation
+
+
+@cached
+def relations_for_id(relid=None):
+    """Get relations of a specific relation ID"""
+    relation_data = []
+    relid = relid or relation_ids()
+    for unit in related_units(relid):
+        unit_data = relation_for_unit(unit, relid)
+        unit_data['__relid__'] = relid
+        relation_data.append(unit_data)
+    return relation_data
+
+
+@cached
+def relations_of_type(reltype=None):
+    """Get relations of a specific type"""
+    relation_data = []
+    reltype = reltype or relation_type()
+    for relid in relation_ids(reltype):
+        for relation in relations_for_id(relid):
+            relation['__relid__'] = relid
+            relation_data.append(relation)
+    return relation_data
+
+
+@cached
+def relation_types():
+    """Get a list of relation types supported by this charm"""
+    charmdir = os.environ.get('CHARM_DIR', '')
+    mdf = open(os.path.join(charmdir, 'metadata.yaml'))
+    md = yaml.safe_load(mdf)
+    rel_types = []
+    for key in ('provides', 'requires', 'peers'):
+        section = md.get(key)
+        if section:
+            rel_types.extend(section.keys())
+    mdf.close()
+    return rel_types
+
+
+@cached
+def relations():
+    """Get a nested dictionary of relation data for all related units"""
+    rels = {}
+    for reltype in relation_types():
+        relids = {}
+        for relid in relation_ids(reltype):
+            units = {local_unit(): relation_get(unit=local_unit(), rid=relid)}
+            for unit in related_units(relid):
+                reldata = relation_get(unit=unit, rid=relid)
+                units[unit] = reldata
+            relids[relid] = units
+        rels[reltype] = relids
+    return rels
+
+
+@cached
+def is_relation_made(relation, keys='private-address'):
+    '''
+    Determine whether a relation is established by checking for
+    presence of key(s).  If a list of keys is provided, they
+    must all be present for the relation to be identified as made
+    '''
+    if isinstance(keys, str):
+        keys = [keys]
+    for r_id in relation_ids(relation):
+        for unit in related_units(r_id):
+            context = {}
+            for k in keys:
+                context[k] = relation_get(k, rid=r_id,
+                                          unit=unit)
+            if None not in context.values():
+                return True
+    return False
+
+
+def open_port(port, protocol="TCP"):
+    """Open a service network port"""
+    _args = ['open-port']
+    _args.append('{}/{}'.format(port, protocol))
+    subprocess.check_call(_args)
+
+
+def close_port(port, protocol="TCP"):
+    """Close a service network port"""
+    _args = ['close-port']
+    _args.append('{}/{}'.format(port, protocol))
+    subprocess.check_call(_args)
+
+
+@cached
+def unit_get(attribute):
+    """Get the unit ID for the remote unit"""
+    _args = ['unit-get', '--format=json', attribute]
+    try:
+        return json.loads(subprocess.check_output(_args))
+    except ValueError:
+        return None
+
+
+def unit_private_ip():
+    """Get this unit's private IP address"""
+    return unit_get('private-address')
+
+
+class UnregisteredHookError(Exception):
+    """Raised when an undefined hook is called"""
+    pass
+
+
+class Hooks(object):
+    """A convenient handler for hook functions.
+
+    Example:
+        hooks = Hooks()
+
+        # register a hook, taking its name from the function name
+        @hooks.hook()
+        def install():
+            ...
+
+        # register a hook, providing a custom hook name
+        @hooks.hook("config-changed")
+        def config_changed():
+            ...
+
+        if __name__ == "__main__":
+            # execute a hook based on the name the program is called by
+            hooks.execute(sys.argv)
+    """
+
+    def __init__(self):
+        super(Hooks, self).__init__()
+        self._hooks = {}
+
+    def register(self, name, function):
+        """Register a hook"""
+        self._hooks[name] = function
+
+    def execute(self, args):
+        """Execute a registered hook based on args[0]"""
+        hook_name = os.path.basename(args[0])
+        if hook_name in self._hooks:
+            self._hooks[hook_name]()
+        else:
+            raise UnregisteredHookError(hook_name)
+
+    def hook(self, *hook_names):
+        """Decorator, registering them as hooks"""
+        def wrapper(decorated):
+            for hook_name in hook_names:
+                self.register(hook_name, decorated)
+            else:
+                self.register(decorated.__name__, decorated)
+                if '_' in decorated.__name__:
+                    self.register(
+                        decorated.__name__.replace('_', '-'), decorated)
+            return decorated
+        return wrapper
+
+
+def charm_dir():
+    """Return the root directory of the current charm"""
+    return os.environ.get('CHARM_DIR')

=== added file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/core/host.py	2014-07-07 20:28:28 +0000
@@ -0,0 +1,325 @@
+"""Tools for working with the host system"""
+# Copyright 2012 Canonical Ltd.
+#
+# Authors:
+#  Nick Moffitt <[e-mail]>
+#  Matthew Wedgwood <[e-mail]>
+
+import os
+import pwd
+import grp
+import random
+import string
+import subprocess
+import hashlib
+import apt_pkg
+
+from collections import OrderedDict
+
+from hookenv import log
+from fstab import Fstab
+
+
+def service_start(service_name):
+    """Start a system service"""
+    return service('start', service_name)
+
+
+def service_stop(service_name):
+    """Stop a system service"""
+    return service('stop', service_name)
+
+
+def service_restart(service_name):
+    """Restart a system service"""
+    return service('restart', service_name)
+
+
+def service_reload(service_name, restart_on_failure=False):
+    """Reload a system service, optionally falling back to restart if
+    reload fails"""
+    service_result = service('reload', service_name)
+    if not service_result and restart_on_failure:
+        service_result = service('restart', service_name)
+    return service_result
+
+
+def service(action, service_name):
+    """Control a system service"""
+    cmd = ['service', service_name, action]
+    return subprocess.call(cmd) == 0
+
+
+def service_running(service):
+    """Determine whether a system service is running"""
+    try:
+        output = subprocess.check_output(['service', service, 'status'])
+    except subprocess.CalledProcessError:
+        return False
+    else:
+        if ("start/running" in output or "is running" in output):
+            return True
+        else:
+            return False
+
+
+def adduser(username, password=None, shell='/bin/bash', system_user=False):
+    """Add a user to the system"""
+    try:
+        user_info = pwd.getpwnam(username)
+        log('user {0} already exists!'.format(username))
+    except KeyError:
+        log('creating user {0}'.format(username))
+        cmd = ['useradd']
+        if system_user or password is None:
+            cmd.append('--system')
+        else:
+            cmd.extend([
+                '--create-home',
+                '--shell', shell,
+                '--password', password,
+            ])
+        cmd.append(username)
+        subprocess.check_call(cmd)
+        user_info = pwd.getpwnam(username)
+    return user_info
+
+
+def add_user_to_group(username, group):
+    """Add a user to a group"""
+    cmd = [
+        'gpasswd', '-a',
+        username,
+        group
+    ]
+    log("Adding user {} to group {}".format(username, group))
+    subprocess.check_call(cmd)
+
+
+def rsync(from_path, to_path, flags='-r', options=None):
+    """Replicate the contents of a path"""
+    options = options or ['--delete', '--executability']
+    cmd = ['/usr/bin/rsync', flags]
+    cmd.extend(options)
+    cmd.append(from_path)
+    cmd.append(to_path)
+    log(" ".join(cmd))
+    return subprocess.check_output(cmd).strip()
+
+
+def symlink(source, destination):
+    """Create a symbolic link"""
+    log("Symlinking {} as {}".format(source, destination))
+    cmd = [
+        'ln',
+        '-sf',
+        source,
+        destination,
+    ]
+    subprocess.check_call(cmd)
+
+
+def mkdir(path, owner='root', group='root', perms=0555, force=False):
+    """Create a directory"""
+    log("Making dir {} {}:{} {:o}".format(path, owner, group,
+                                          perms))
+    uid = pwd.getpwnam(owner).pw_uid
+    gid = grp.getgrnam(group).gr_gid
+    realpath = os.path.abspath(path)
+    if os.path.exists(realpath):
+        if force and not os.path.isdir(realpath):
+            log("Removing non-directory file {} prior to mkdir()".format(path))
+            os.unlink(realpath)
+    else:
+        os.makedirs(realpath, perms)
+    os.chown(realpath, uid, gid)
+
+
+def write_file(path, content, owner='root', group='root', perms=0444):
+    """Create or overwrite a file with the contents of a string"""
+    log("Writing file {} {}:{} {:o}".format(path, owner, group, perms))
+    uid = pwd.getpwnam(owner).pw_uid
+    gid = grp.getgrnam(group).gr_gid
+    with open(path, 'w') as target:
+        os.fchown(target.fileno(), uid, gid)
+        os.fchmod(target.fileno(), perms)
+        target.write(content)
+
+
+def fstab_remove(mp):
+    """Remove the given mountpoint entry from /etc/fstab
+    """
+    return Fstab.remove_by_mountpoint(mp)
+
+
+def fstab_add(dev, mp, fs, options=None):
+    """Adds the given device entry to the /etc/fstab file
+    """
+    return Fstab.add(dev, mp, fs, options=options)
+
+
+def mount(device, mountpoint, options=None, persist=False, filesystem="ext3"):
+    """Mount a filesystem at a particular mountpoint"""
+    cmd_args = ['mount']
+    if options is not None:
+        cmd_args.extend(['-o', options])
+    cmd_args.extend([device, mountpoint])
+    try:
+        subprocess.check_output(cmd_args)
+    except subprocess.CalledProcessError, e:
+        log('Error mounting {} at {}\n{}'.format(device, mountpoint, e.output))
+        return False
+
+    if persist:
+        return fstab_add(device, mountpoint, filesystem, options=options)
+    return True
+
+
+def umount(mountpoint, persist=False):
+    """Unmount a filesystem"""
+    cmd_args = ['umount', mountpoint]
+    try:
+        subprocess.check_output(cmd_args)
+    except subprocess.CalledProcessError, e:
+        log('Error unmounting {}\n{}'.format(mountpoint, e.output))
+        return False
+
+    if persist:
+        return fstab_remove(mountpoint)
+    return True
+
+
+def mounts():
+    """Get a list of all mounted volumes as [[mountpoint,device],[...]]"""
+    with open('/proc/mounts') as f:
+        # [['/mount/point','/dev/path'],[...]]
+        system_mounts = [m[1::-1] for m in [l.strip().split()
+                                            for l in f.readlines()]]
+    return system_mounts
+
+
+def file_hash(path):
+    """Generate a md5 hash of the contents of 'path' or None if not found """
+    if os.path.exists(path):
+        h = hashlib.md5()
+        with open(path, 'r') as source:
+            h.update(source.read())  # IGNORE:E1101 - it does have update
+        return h.hexdigest()
+    else:
+        return None
+
+
+def restart_on_change(restart_map, stopstart=False):
+    """Restart services based on configuration files changing
+
+    This function is used a decorator, for example
+
+        @restart_on_change({
+            '/etc/ceph/ceph.conf': [ 'cinder-api', 'cinder-volume' ]
+            })
+        def ceph_client_changed():
+            ...
+
+    In this example, the cinder-api and cinder-volume services
+    would be restarted if /etc/ceph/ceph.conf is changed by the
+    ceph_client_changed function.
+    """
+    def wrap(f):
+        def wrapped_f(*args):
+            checksums = {}
+            for path in restart_map:
+                checksums[path] = file_hash(path)
+            f(*args)
+            restarts = []
+            for path in restart_map:
+                if checksums[path] != file_hash(path):
+                    restarts += restart_map[path]
+            services_list = list(OrderedDict.fromkeys(restarts))
+            if not stopstart:
+                for service_name in services_list:
+                    service('restart', service_name)
+            else:
+                for action in ['stop', 'start']:
+                    for service_name in services_list:
+                        service(action, service_name)
+        return wrapped_f
+    return wrap
+
+
+def lsb_release():
+    """Return /etc/lsb-release in a dict"""
+    d = {}
+    with open('/etc/lsb-release', 'r') as lsb:
+        for l in lsb:
+            k, v = l.split('=')
+            d[k.strip()] = v.strip()
+    return d
+
+
+def pwgen(length=None):
+    """Generate a random pasword."""
+    if length is None:
+        length = random.choice(range(35, 45))
+    alphanumeric_chars = [
+        l for l in (string.letters + string.digits)
+        if l not in 'l0QD1vAEIOUaeiou']
+    random_chars = [
+        random.choice(alphanumeric_chars) for _ in range(length)]
+    return(''.join(random_chars))
+
+
+def list_nics(nic_type):
+    '''Return a list of nics of given type(s)'''
+    if isinstance(nic_type, basestring):
+        int_types = [nic_type]
+    else:
+        int_types = nic_type
+    interfaces = []
+    for int_type in int_types:
+        cmd = ['ip', 'addr', 'show', 'label', int_type + '*']
+        ip_output = subprocess.check_output(cmd).split('\n')
+        ip_output = (line for line in ip_output if line)
+        for line in ip_output:
+            if line.split()[1].startswith(int_type):
+                interfaces.append(line.split()[1].replace(":", ""))
+    return interfaces
+
+
+def set_nic_mtu(nic, mtu):
+    '''Set MTU on a network interface'''
+    cmd = ['ip', 'link', 'set', nic, 'mtu', mtu]
+    subprocess.check_call(cmd)
+
+
+def get_nic_mtu(nic):
+    cmd = ['ip', 'addr', 'show', nic]
+    ip_output = subprocess.check_output(cmd).split('\n')
+    mtu = ""
+    for line in ip_output:
+        words = line.split()
+        if 'mtu' in words:
+            mtu = words[words.index("mtu") + 1]
+    return mtu
+
+
+def get_nic_hwaddr(nic):
+    cmd = ['ip', '-o', '-0', 'addr', 'show', nic]
+    ip_output = subprocess.check_output(cmd)
+    hwaddr = ""
+    words = ip_output.split()
+    if 'link/ether' in words:
+        hwaddr = words[words.index('link/ether') + 1]
+    return hwaddr
+
+
+def cmp_pkgrevno(package, revno, pkgcache=None):
+    '''Compare supplied revno with the revno of the installed package
+       1 => Installed revno is greater than supplied arg
+       0 => Installed revno is the same as supplied arg
+      -1 => Installed revno is less than supplied arg
+    '''
+    if not pkgcache:
+        apt_pkg.init()
+        pkgcache = apt_pkg.Cache()
+    pkg = pkgcache[package]
+    return apt_pkg.version_compare(pkg.current_ver.ver_str, revno)

=== added directory 'hooks/charmhelpers/fetch'
=== added file 'hooks/charmhelpers/fetch/__init__.py'
--- hooks/charmhelpers/fetch/__init__.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/fetch/__init__.py	2014-07-07 20:28:28 +0000
@@ -0,0 +1,349 @@
+import importlib
+import time
+from yaml import safe_load
+from charmhelpers.core.host import (
+    lsb_release
+)
+from urlparse import (
+    urlparse,
+    urlunparse,
+)
+import subprocess
+from charmhelpers.core.hookenv import (
+    config,
+    log,
+)
+import apt_pkg
+import os
+
+
+CLOUD_ARCHIVE = """# Ubuntu Cloud Archive
+deb http://ubuntu-cloud.archive.canonical.com/ubuntu {} main
+"""
+PROPOSED_POCKET = """# Proposed
+deb http://archive.ubuntu.com/ubuntu {}-proposed main universe multiverse restricted
+"""
+CLOUD_ARCHIVE_POCKETS = {
+    # Folsom
+    'folsom': 'precise-updates/folsom',
+    'precise-folsom': 'precise-updates/folsom',
+    'precise-folsom/updates': 'precise-updates/folsom',
+    'precise-updates/folsom': 'precise-updates/folsom',
+    'folsom/proposed': 'precise-proposed/folsom',
+    'precise-folsom/proposed': 'precise-proposed/folsom',
+    'precise-proposed/folsom': 'precise-proposed/folsom',
+    # Grizzly
+    'grizzly': 'precise-updates/grizzly',
+    'precise-grizzly': 'precise-updates/grizzly',
+    'precise-grizzly/updates': 'precise-updates/grizzly',
+    'precise-updates/grizzly': 'precise-updates/grizzly',
+    'grizzly/proposed': 'precise-proposed/grizzly',
+    'precise-grizzly/proposed': 'precise-proposed/grizzly',
+    'precise-proposed/grizzly': 'precise-proposed/grizzly',
+    # Havana
+    'havana': 'precise-updates/havana',
+    'precise-havana': 'precise-updates/havana',
+    'precise-havana/updates': 'precise-updates/havana',
+    'precise-updates/havana': 'precise-updates/havana',
+    'havana/proposed': 'precise-proposed/havana',
+    'precise-havana/proposed': 'precise-proposed/havana',
+    'precise-proposed/havana': 'precise-proposed/havana',
+    # Icehouse
+    'icehouse': 'precise-updates/icehouse',
+    'precise-icehouse': 'precise-updates/icehouse',
+    'precise-icehouse/updates': 'precise-updates/icehouse',
+    'precise-updates/icehouse': 'precise-updates/icehouse',
+    'icehouse/proposed': 'precise-proposed/icehouse',
+    'precise-icehouse/proposed': 'precise-proposed/icehouse',
+    'precise-proposed/icehouse': 'precise-proposed/icehouse',
+    # Juno
+    'juno': 'trusty-updates/juno',
+    'trusty-juno': 'trusty-updates/juno',
+    'trusty-juno/updates': 'trusty-updates/juno',
+    'trusty-updates/juno': 'trusty-updates/juno',
+    'juno/proposed': 'trusty-proposed/juno',
+    'juno/proposed': 'trusty-proposed/juno',
+    'trusty-juno/proposed': 'trusty-proposed/juno',
+    'trusty-proposed/juno': 'trusty-proposed/juno',
+}
+
+# The order of this list is very important. Handlers should be listed in from
+# least- to most-specific URL matching.
+FETCH_HANDLERS = (
+    'charmhelpers.fetch.archiveurl.ArchiveUrlFetchHandler',
+    'charmhelpers.fetch.bzrurl.BzrUrlFetchHandler',
+)
+
+APT_NO_LOCK = 100  # The return code for "couldn't acquire lock" in APT.
+APT_NO_LOCK_RETRY_DELAY = 10  # Wait 10 seconds between apt lock checks.
+APT_NO_LOCK_RETRY_COUNT = 30  # Retry to acquire the lock X times.
+
+
+class SourceConfigError(Exception):
+    pass
+
+
+class UnhandledSource(Exception):
+    pass
+
+
+class AptLockError(Exception):
+    pass
+
+
+class BaseFetchHandler(object):
+
+    """Base class for FetchHandler implementations in fetch plugins"""
+
+    def can_handle(self, source):
+        """Returns True if the source can be handled. Otherwise returns
+        a string explaining why it cannot"""
+        return "Wrong source type"
+
+    def install(self, source):
+        """Try to download and unpack the source. Return the path to the
+        unpacked files or raise UnhandledSource."""
+        raise UnhandledSource("Wrong source type {}".format(source))
+
+    def parse_url(self, url):
+        return urlparse(url)
+
+    def base_url(self, url):
+        """Return url without querystring or fragment"""
+        parts = list(self.parse_url(url))
+        parts[4:] = ['' for i in parts[4:]]
+        return urlunparse(parts)
+
+
+def filter_installed_packages(packages):
+    """Returns a list of packages that require installation"""
+    apt_pkg.init()
+
+    # Tell apt to build an in-memory cache to prevent race conditions (if
+    # another process is already building the cache).
+    apt_pkg.config.set("Dir::Cache::pkgcache", "")
+
+    cache = apt_pkg.Cache()
+    _pkgs = []
+    for package in packages:
+        try:
+            p = cache[package]
+            p.current_ver or _pkgs.append(package)
+        except KeyError:
+            log('Package {} has no installation candidate.'.format(package),
+                level='WARNING')
+            _pkgs.append(package)
+    return _pkgs
+
+
+def apt_install(packages, options=None, fatal=False):
+    """Install one or more packages"""
+    if options is None:
+        options = ['--option=Dpkg::Options::=--force-confold']
+
+    cmd = ['apt-get', '--assume-yes']
+    cmd.extend(options)
+    cmd.append('install')
+    if isinstance(packages, basestring):
+        cmd.append(packages)
+    else:
+        cmd.extend(packages)
+    log("Installing {} with options: {}".format(packages,
+                                                options))
+    _run_apt_command(cmd, fatal)
+
+
+def apt_upgrade(options=None, fatal=False, dist=False):
+    """Upgrade all packages"""
+    if options is None:
+        options = ['--option=Dpkg::Options::=--force-confold']
+
+    cmd = ['apt-get', '--assume-yes']
+    cmd.extend(options)
+    if dist:
+        cmd.append('dist-upgrade')
+    else:
+        cmd.append('upgrade')
+    log("Upgrading with options: {}".format(options))
+    _run_apt_command(cmd, fatal)
+
+
+def apt_update(fatal=False):
+    """Update local apt cache"""
+    cmd = ['apt-get', 'update']
+    _run_apt_command(cmd, fatal)
+
+
+def apt_purge(packages, fatal=False):
+    """Purge one or more packages"""
+    cmd = ['apt-get', '--assume-yes', 'purge']
+    if isinstance(packages, basestring):
+        cmd.append(packages)
+    else:
+        cmd.extend(packages)
+    log("Purging {}".format(packages))
+    _run_apt_command(cmd, fatal)
+
+
+def apt_hold(packages, fatal=False):
+    """Hold one or more packages"""
+    cmd = ['apt-mark', 'hold']
+    if isinstance(packages, basestring):
+        cmd.append(packages)
+    else:
+        cmd.extend(packages)
+    log("Holding {}".format(packages))
+
+    if fatal:
+        subprocess.check_call(cmd)
+    else:
+        subprocess.call(cmd)
+
+
+def add_source(source, key=None):
+    if source is None:
+        log('Source is not present. Skipping')
+        return
+
+    if (source.startswith('ppa:') or
+        source.startswith('http') or
+        source.startswith('deb ') or
+            source.startswith('cloud-archive:')):
+        subprocess.check_call(['add-apt-repository', '--yes', source])
+    elif source.startswith('cloud:'):
+        apt_install(filter_installed_packages(['ubuntu-cloud-keyring']),
+                    fatal=True)
+        pocket = source.split(':')[-1]
+        if pocket not in CLOUD_ARCHIVE_POCKETS:
+            raise SourceConfigError(
+                'Unsupported cloud: source option %s' %
+                pocket)
+        actual_pocket = CLOUD_ARCHIVE_POCKETS[pocket]
+        with open('/etc/apt/sources.list.d/cloud-archive.list', 'w') as apt:
+            apt.write(CLOUD_ARCHIVE.format(actual_pocket))
+    elif source == 'proposed':
+        release = lsb_release()['DISTRIB_CODENAME']
+        with open('/etc/apt/sources.list.d/proposed.list', 'w') as apt:
+            apt.write(PROPOSED_POCKET.format(release))
+    if key:
+        subprocess.check_call(['apt-key', 'adv', '--keyserver',
+                               'hkp://keyserver.ubuntu.com:80', '--recv',
+                               key])
+
+
+def configure_sources(update=False,
+                      sources_var='install_sources',
+                      keys_var='install_keys'):
+    """
+    Configure multiple sources from charm configuration
+
+    Example config:
+        install_sources:
+          - "ppa:foo"
+          - "http://example.com/repo precise main"
+        install_keys:
+          - null
+          - "a1b2c3d4"
+
+    Note that 'null' (a.k.a. None) should not be quoted.
+    """
+    sources = safe_load(config(sources_var))
+    keys = config(keys_var)
+    if keys is not None:
+        keys = safe_load(keys)
+    if isinstance(sources, basestring) and (
+            keys is None or isinstance(keys, basestring)):
+        add_source(sources, keys)
+    else:
+        if not len(sources) == len(keys):
+            msg = 'Install sources and keys lists are different lengths'
+            raise SourceConfigError(msg)
+        for src_num in range(len(sources)):
+            add_source(sources[src_num], keys[src_num])
+    if update:
+        apt_update(fatal=True)
+
+
+def install_remote(source):
+    """
+    Install a file tree from a remote source
+
+    The specified source should be a url of the form:
+        scheme://[host]/path[#[option=value][&...]]
+
+    Schemes supported are based on this modules submodules
+    Options supported are submodule-specific"""
+    # We ONLY check for True here because can_handle may return a string
+    # explaining why it can't handle a given source.
+    handlers = [h for h in plugins() if h.can_handle(source) is True]
+    installed_to = None
+    for handler in handlers:
+        try:
+            installed_to = handler.install(source)
+        except UnhandledSource:
+            pass
+    if not installed_to:
+        raise UnhandledSource("No handler found for source {}".format(source))
+    return installed_to
+
+
+def install_from_config(config_var_name):
+    charm_config = config()
+    source = charm_config[config_var_name]
+    return install_remote(source)
+
+
+def plugins(fetch_handlers=None):
+    if not fetch_handlers:
+        fetch_handlers = FETCH_HANDLERS
+    plugin_list = []
+    for handler_name in fetch_handlers:
+        package, classname = handler_name.rsplit('.', 1)
+        try:
+            handler_class = getattr(
+                importlib.import_module(package),
+                classname)
+            plugin_list.append(handler_class())
+        except (ImportError, AttributeError):
+            # Skip missing plugins so that they can be ommitted from
+            # installation if desired
+            log("FetchHandler {} not found, skipping plugin".format(
+                handler_name))
+    return plugin_list
+
+
+def _run_apt_command(cmd, fatal=False):
+    """
+    Run an APT command, checking output and retrying if the fatal flag is set
+    to True.
+
+    :param: cmd: str: The apt command to run.
+    :param: fatal: bool: Whether the command's output should be checked and
+        retried.
+    """
+    env = os.environ.copy()
+
+    if 'DEBIAN_FRONTEND' not in env:
+        env['DEBIAN_FRONTEND'] = 'noninteractive'
+
+    if fatal:
+        retry_count = 0
+        result = None
+
+        # If the command is considered "fatal", we need to retry if the apt
+        # lock was not acquired.
+
+        while result is None or result == APT_NO_LOCK:
+            try:
+                result = subprocess.check_call(cmd, env=env)
+            except subprocess.CalledProcessError, e:
+                retry_count = retry_count + 1
+                if retry_count > APT_NO_LOCK_RETRY_COUNT:
+                    raise
+                result = e.returncode
+                log("Couldn't acquire DPKG lock. Will retry in {} seconds."
+                    "".format(APT_NO_LOCK_RETRY_DELAY))
+                time.sleep(APT_NO_LOCK_RETRY_DELAY)
+
+    else:
+        subprocess.call(cmd, env=env)

=== added file 'hooks/charmhelpers/fetch/archiveurl.py'
--- hooks/charmhelpers/fetch/archiveurl.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/fetch/archiveurl.py	2014-07-07 20:28:28 +0000
@@ -0,0 +1,63 @@
+import os
+import urllib2
+import urlparse
+
+from charmhelpers.fetch import (
+    BaseFetchHandler,
+    UnhandledSource
+)
+from charmhelpers.payload.archive import (
+    get_archive_handler,
+    extract,
+)
+from charmhelpers.core.host import mkdir
+
+
+class ArchiveUrlFetchHandler(BaseFetchHandler):
+    """Handler for archives via generic URLs"""
+    def can_handle(self, source):
+        url_parts = self.parse_url(source)
+        if url_parts.scheme not in ('http', 'https', 'ftp', 'file'):
+            return "Wrong source type"
+        if get_archive_handler(self.base_url(source)):
+            return True
+        return False
+
+    def download(self, source, dest):
+        # propogate all exceptions
+        # URLError, OSError, etc
+        proto, netloc, path, params, query, fragment = urlparse.urlparse(source)
+        if proto in ('http', 'https'):
+            auth, barehost = urllib2.splituser(netloc)
+            if auth is not None:
+                source = urlparse.urlunparse((proto, barehost, path, params, query, fragment))
+                username, password = urllib2.splitpasswd(auth)
+                passman = urllib2.HTTPPasswordMgrWithDefaultRealm()
+                # Realm is set to None in add_password to force the username and password
+                # to be used whatever the realm
+                passman.add_password(None, source, username, password)
+                authhandler = urllib2.HTTPBasicAuthHandler(passman)
+                opener = urllib2.build_opener(authhandler)
+                urllib2.install_opener(opener)
+        response = urllib2.urlopen(source)
+        try:
+            with open(dest, 'w') as dest_file:
+                dest_file.write(response.read())
+        except Exception as e:
+            if os.path.isfile(dest):
+                os.unlink(dest)
+            raise e
+
+    def install(self, source):
+        url_parts = self.parse_url(source)
+        dest_dir = os.path.join(os.environ.get('CHARM_DIR'), 'fetched')
+        if not os.path.exists(dest_dir):
+            mkdir(dest_dir, perms=0755)
+        dld_file = os.path.join(dest_dir, os.path.basename(url_parts.path))
+        try:
+            self.download(source, dld_file)
+        except urllib2.URLError as e:
+            raise UnhandledSource(e.reason)
+        except OSError as e:
+            raise UnhandledSource(e.strerror)
+        return extract(dld_file)

=== added file 'hooks/charmhelpers/fetch/bzrurl.py'
--- hooks/charmhelpers/fetch/bzrurl.py	1970-01-01 00:00:00 +0000
+++ hooks/charmhelpers/fetch/bzrurl.py	2014-07-07 20:28:28 +0000
@@ -0,0 +1,50 @@
+import os
+from charmhelpers.fetch import (
+    BaseFetchHandler,
+    UnhandledSource
+)
+from charmhelpers.core.host import mkdir
+
+try:
+    from bzrlib.branch import Branch
+except ImportError:
+    from charmhelpers.fetch import apt_install
+    apt_install("python-bzrlib")
+    from bzrlib.branch import Branch
+
+
+class BzrUrlFetchHandler(BaseFetchHandler):
+    """Handler for bazaar branches via generic and lp URLs"""
+    def can_handle(self, source):
+        url_parts = self.parse_url(source)
+        if url_parts.scheme not in ('bzr+ssh', 'lp'):
+            return False
+        else:
+            return True
+
+    def branch(self, source, dest):
+        url_parts = self.parse_url(source)
+        # If we use lp:branchname scheme we need to load plugins
+        if not self.can_handle(source):
+            raise UnhandledSource("Cannot handle {}".format(source))
+        if url_parts.scheme == "lp":
+            from bzrlib.plugin import load_plugins
+            load_plugins()
+        try:
+            remote_branch = Branch.open(source)
+            remote_branch.bzrdir.sprout(dest).open_branch()
+        except Exception as e:
+            raise e
+
+    def install(self, source):
+        url_parts = self.parse_url(source)
+        branch_name = url_parts.path.strip("/").split("/")[-1]
+        dest_dir = os.path.join(os.environ.get('CHARM_DIR'), "fetched",
+                                branch_name)
+        if not os.path.exists(dest_dir):
+            mkdir(dest_dir, perms=0755)
+        try:
+            self.branch(source, dest_dir)
+        except OSError as e:
+            raise UnhandledSource(e.strerror)
+        return dest_dir

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-06-18 18:35:01 +0000
+++ hooks/hooks.py	2014-07-07 20:28:28 +0000
@@ -1,854 +1,38 @@
 #!/usr/bin/env python
-# vim: et ai ts=4 sw=4:
 
-import json
-import os
-import re
-import subprocess
 import sys
-import time
-from pwd import getpwnam
-from grp import getgrnam
-from random import choice
-
-CHARM_PACKAGES = ["python-pip", "python-jinja2", "mercurial", "git-core",
-                  "subversion", "bzr", "gettext"]
-
-INJECTED_WARNING = """
-#------------------------------------------------------------------------------
-# The following is the import code for the settings directory injected by Juju
-#------------------------------------------------------------------------------
-"""
-
-
-###############################################################################
-# Supporting functions
-###############################################################################
-MSG_CRITICAL = "CRITICAL"
-MSG_DEBUG = "DEBUG"
-MSG_INFO = "INFO"
-MSG_ERROR = "ERROR"
-MSG_WARNING = "WARNING"
-
-
-def juju_log(level, msg):
-    subprocess.call(['juju-log', '-l', level, msg])
-
-#------------------------------------------------------------------------------
-# run: Run a command, return the output
-#------------------------------------------------------------------------------
-def run(command, exit_on_error=True, cwd=None):
-    try:
-        juju_log(MSG_DEBUG, command)
-        return subprocess.check_output(
-            command, stderr=subprocess.STDOUT, shell=True, cwd=cwd)
-    except subprocess.CalledProcessError, e:
-        juju_log(MSG_ERROR, "status=%d, output=%s" % (e.returncode, e.output))
-        if exit_on_error:
-            sys.exit(e.returncode)
-        else:
-            raise
-
-
-#------------------------------------------------------------------------------
-# install_file: install a file resource. overwites existing files.
-#------------------------------------------------------------------------------
-def install_file(contents, dest, owner="root", group="root", mode=0600):
-    uid = getpwnam(owner)[2]
-    gid = getgrnam(group)[2]
-    dest_fd = os.open(dest, os.O_WRONLY | os.O_TRUNC | os.O_CREAT, mode)
-    os.fchown(dest_fd, uid, gid)
-    with os.fdopen(dest_fd, 'w') as destfile:
-        destfile.write(str(contents))
-
-
-#------------------------------------------------------------------------------
-# install_dir: create a directory
-#------------------------------------------------------------------------------
-def install_dir(dirname, owner="root", group="root", mode=0700):
-    command = \
-    '/usr/bin/install -o {} -g {} -m {} -d {}'.format(owner, group, oct(mode),
-        dirname)
-    return run(command)
-
-#------------------------------------------------------------------------------
-# config_get:  Returns a dictionary containing all of the config information
-#              Optional parameter: scope
-#              scope: limits the scope of the returned configuration to the
-#                     desired config item.
-#------------------------------------------------------------------------------
-def config_get(scope=None):
-    try:
-        config_cmd_line = ['config-get']
-        if scope is not None:
-            config_cmd_line.append(scope)
-        config_cmd_line.append('--format=json')
-        config_data = json.loads(subprocess.check_output(config_cmd_line))
-    except:
-        config_data = None
-    finally:
-        return(config_data)
-
-
-#------------------------------------------------------------------------------
-# relation_json:  Returns json-formatted relation data
-#                Optional parameters: scope, relation_id
-#                scope:        limits the scope of the returned data to the
-#                              desired item.
-#                unit_name:    limits the data ( and optionally the scope )
-#                              to the specified unit
-#                relation_id:  specify relation id for out of context usage.
-#------------------------------------------------------------------------------
-def relation_json(scope=None, unit_name=None, relation_id=None):
-    command = ['relation-get', '--format=json']
-    if relation_id is not None:
-        command.extend(('-r', relation_id))
-    if scope is not None:
-        command.append(scope)
-    else:
-        command.append('-')
-    if unit_name is not None:
-        command.append(unit_name)
-    output = subprocess.check_output(command, stderr=subprocess.STDOUT)
-    return output or None
-
-
-#------------------------------------------------------------------------------
-# relation_get:  Returns a dictionary containing the relation information
-#                Optional parameters: scope, relation_id
-#                scope:        limits the scope of the returned data to the
-#                              desired item.
-#                unit_name:    limits the data ( and optionally the scope )
-#                              to the specified unit
-#------------------------------------------------------------------------------
-def relation_get(scope=None, unit_name=None, relation_id=None):
-    j = relation_json(scope, unit_name, relation_id)
-    if j:
-        return json.loads(j)
-    else:
-        return None
-
-
-def relation_set(keyvalues, relation_id=None):
-    args = []
-    if relation_id:
-        args.extend(['-r', relation_id])
-    args.extend(["{}='{}'".format(k, v or '') for k, v in keyvalues.items()])
-    run("relation-set {}".format(' '.join(args)))
-
-    ## Posting json to relation-set doesn't seem to work as documented?
-    ## Bug #1116179
-    ##
-    ## cmd = ['relation-set']
-    ## if relation_id:
-    ##     cmd.extend(['-r', relation_id])
-    ## p = Popen(
-    ##     cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-    ##     stderr=subprocess.PIPE)
-    ## (out, err) = p.communicate(json.dumps(keyvalues))
-    ## if p.returncode:
-    ##     juju_log(MSG_ERROR, err)
-    ##     sys.exit(1)
-    ## juju_log(MSG_DEBUG, "relation-set {}".format(repr(keyvalues)))
-
-
-def relation_list(relation_id=None):
-    """Return the list of units participating in the relation."""
-    if relation_id is None:
-        relation_id = os.environ['JUJU_RELATION_ID']
-    cmd = ['relation-list', '--format=json', '-r', relation_id]
-    json_units = subprocess.check_output(cmd).strip()
-    if json_units:
-        return json.loads(subprocess.check_output(cmd))
-    return []
-
-
-#------------------------------------------------------------------------------
-# relation_ids:  Returns a list of relation ids
-#                optional parameters: relation_type
-#                relation_type: return relations only of this type
-#------------------------------------------------------------------------------
-def relation_ids(relation_types=('db',)):
-    # accept strings or iterators
-    if isinstance(relation_types, basestring):
-        reltypes = [relation_types, ]
-    else:
-        reltypes = relation_types
-    relids = []
-    for reltype in reltypes:
-        relid_cmd_line = ['relation-ids', '--format=json', reltype]
-        json_relids = subprocess.check_output(relid_cmd_line).strip()
-        if json_relids:
-            relids.extend(json.loads(json_relids))
-    return relids
-
-
-#------------------------------------------------------------------------------
-# relation_get_all:  Returns a dictionary containing the relation information
-#                optional parameters: relation_type
-#                relation_type: limits the scope of the returned data to the
-#                               desired item.
-#------------------------------------------------------------------------------
-def relation_get_all(*args, **kwargs):
-    relation_data = []
-    relids = relation_ids(*args, **kwargs)
-    for relid in relids:
-        units_cmd_line = ['relation-list', '--format=json', '-r', relid]
-        json_units = subprocess.check_output(units_cmd_line).strip()
-        if json_units:
-            for unit in json.loads(json_units):
-                unit_data = \
-                    json.loads(relation_json(relation_id=relid,
-                        unit_name=unit))
-                for key in unit_data:
-                    if key.endswith('-list'):
-                        unit_data[key] = unit_data[key].split()
-                unit_data['relation-id'] = relid
-                unit_data['unit'] = unit
-                relation_data.append(unit_data)
-    return relation_data
-
-def apt_get_update():
-    cmd_line = ['apt-get', 'update']
-    return(subprocess.call(cmd_line))
-
-
-#------------------------------------------------------------------------------
-# apt_get_install( packages ):  Installs package(s)
-#------------------------------------------------------------------------------
-def apt_get_install(packages=None):
-    if packages is None:
-        return(False)
-    cmd_line = ['apt-get', '-y', 'install', '-qq']
-    if isinstance(packages, list):
-        cmd_line.extend(packages)
-    else:
-        cmd_line.append(packages)
-    return(subprocess.call(cmd_line))
-
-
-#------------------------------------------------------------------------------
-# pip_install( package ):  Installs a python package
-#------------------------------------------------------------------------------
-def pip_install(packages=None, upgrade=False):
-    # Build in /tmp or Juju's internal git will be confused
-    cmd_line = ['pip', 'install', '-b', '/tmp/']
-    if packages is None:
-        return(False)
-    if upgrade:
-        cmd_line.append('--upgrade')
-    if not isinstance(packages, list):
-        packages = [packages]
-
-    for package in packages:
-        if package.startswith('svn+') or package.startswith('git+') or \
-           package.startswith('hg+') or package.startswith('bzr+'):
-            cmd_line.append('-e')
-        cmd_line.append(package)
-
-    cmd_line.append('--use-mirrors')
-    return(subprocess.call(cmd_line))
-
-#------------------------------------------------------------------------------
-# pip_install_req( path ):  Installs a requirements file
-#------------------------------------------------------------------------------
-def pip_install_req(path=None, upgrade=False):
-    # Build in /tmp or Juju's internal git will be confused
-    cmd_line = ['pip', 'install', '-b', '/tmp/']
-    if path is None:
-        return(False)
-    if upgrade:
-        cmd_line.append('--upgrade')
-    cmd_line.append('-r')
-    cmd_line.append(path)
-    cwd = os.path.dirname(path)
-    cmd_line.append('--use-mirrors')
-    return(subprocess.call(cmd_line, cwd=cwd))
-
-#------------------------------------------------------------------------------
-# open_port:  Convenience function to open a port in juju to
-#             expose a service
-#------------------------------------------------------------------------------
-def open_port(port=None, protocol="TCP"):
-    if port is None:
-        return(None)
-    return(subprocess.call(['open-port', "%d/%s" %
-        (int(port), protocol)]))
-
-
-#------------------------------------------------------------------------------
-# close_port:  Convenience function to close a port in juju to
-#              unexpose a service
-#------------------------------------------------------------------------------
-def close_port(port=None, protocol="TCP"):
-    if port is None:
-        return(None)
-    return(subprocess.call(['close-port', "%d/%s" %
-        (int(port), protocol)]))
-
-
-#------------------------------------------------------------------------------
-# update_service_ports:  Convenience function that evaluate the old and new
-#                        service ports to decide which ports need to be
-#                        opened and which to close
-#------------------------------------------------------------------------------
-def update_service_port(old_service_port=None, new_service_port=None):
-    if old_service_port is None or new_service_port is None:
-        return(None)
-    if new_service_port != old_service_port:
-        close_port(old_service_port)
-        open_port(new_service_port)
-
-#
-# Utils
-#
-
-def install_or_append(contents, dest, owner="root", group="root", mode=0600):
-    if os.path.exists(dest):
-        uid = getpwnam(owner)[2]
-        gid = getgrnam(group)[2]
-        dest_fd = os.open(dest, os.O_APPEND, mode)
-        os.fchown(dest_fd, uid, gid)
-        with os.fdopen(dest_fd, 'a') as destfile:
-            destfile.write(str(contents))
-    else:
-        install_file(contents, dest, owner, group, mode)
-
-def token_sql_safe(value):
-    # Only allow alphanumeric + underscore in database identifiers
-    if re.search('[^A-Za-z0-9_]', value):
-        return False
-    return True
-
-def sanitize(s):
-    s = s.replace(':', '_')
-    s = s.replace('-', '_')
-    s = s.replace('/', '_')
-    s = s.replace('"', '_')
-    s = s.replace("'", '_')
-    return s
-
-def user_name(relid, remote_unit, admin=False, schema=False):
-    components = [sanitize(relid), sanitize(remote_unit)]
-    if admin:
-        components.append("admin")
-    elif schema:
-        components.append("schema")
-    return "_".join(components)
-
-def get_relation_host():
-    remote_host = run("relation-get ip")
-    if not remote_host:
-        # remote unit $JUJU_REMOTE_UNIT uses deprecated 'ip=' component of
-        # interface.
-        remote_host = run("relation-get private-address")
-    return remote_host
-
-
-def get_unit_host():
-    this_host = run("unit-get private-address")
-    return this_host.strip()
-
-def process_template(template_name, template_vars, destination):
-    # --- exported service configuration file
-    from jinja2 import Environment, FileSystemLoader
-    template_env = Environment(
-        loader=FileSystemLoader(os.path.join(os.environ['CHARM_DIR'],
-        'templates')))
-
-    template = \
-        template_env.get_template(template_name).render(template_vars)
-
-    with open(destination, 'w') as inject_file:
-        inject_file.write(str(template))
-
-def configure_and_install(rel):
-
-    def _import_key(id):
-        cmd = "apt-key adv --keyserver keyserver.ubuntu.com " \
-              "--recv-keys %s" % id
-        try:
-            subprocess.check_call(cmd.split(' '))
-        except:
-            juju_log(MSG_ERROR, "Error importing repo key %s" % id)
-
-    if rel == 'distro':
-        return apt_get_install("python-django")
-    elif rel[:4] == "ppa:":
-        src = rel
-        subprocess.check_call(["add-apt-repository", "-y", src])
-
-        return apt_get_install("python-django")
-    elif rel[:3] == "deb":
-        l = len(rel.split('|'))
-        if l ==  2:
-            src, key = rel.split('|')
-            juju_log("Importing PPA key from keyserver for %s" % src)
-            _import_key(key)
-        elif l == 1:
-            src = rel
-        else:
-            juju_log(MSG_ERROR, "Invalid django-release: %s" % rel)
-
-        with open('/etc/apt/sources.list.d/juju_python_django_deb.list', 'w') as f:
-            f.write(src)
-
-        return apt_get_install("python-django")
-    elif rel == '':
-        return pip_install('Django')
-    else:
-        return pip_install(rel)
-
-#
-# from:
-#   http://stackoverflow.com/questions/377017/test-if-executable-exists-in-python
-#
-def which(program):
-    def is_exe(fpath):
-        return os.path.isfile(fpath) and os.access(fpath, os.X_OK)
-
-    for path in os.environ["PATH"].split(os.pathsep):
-        path = path.strip('"')
-        exe_file = os.path.join(path, program)
-        if is_exe(exe_file):
-            return exe_file
-
-    return False
-
-def find_django_admin_cmd():
-    for cmd in ['django-admin.py', 'django-admin']:
-        django_admin_cmd = which(cmd)
-        if django_admin_cmd:
-            return django_admin_cmd
-
-    juju_log(MSG_ERROR, "No django-admin executable found.")
-
-def append_template(template_name, template_vars, path, try_append=False):
-
-    # --- exported service configuration file
-    from jinja2 import Environment, FileSystemLoader
-    template_env = Environment(
-        loader=FileSystemLoader(os.path.join(os.environ['CHARM_DIR'],
-        'templates')))
-
-    template = \
-        template_env.get_template(template_name).render(template_vars)
-
-    append = False
-    if os.path.exists(path):
-        with open(path, 'r') as inject_file:
-            if not str(template) in inject_file:
-                append = True
-    else:       
-        append = True
-        
-    if append == True:
-        with open(path, 'a') as inject_file:
-            inject_file.write(INJECTED_WARNING)
-            inject_file.write(str(template))
-
-
-
-###############################################################################
-# Hook functions
-###############################################################################
+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.yml',
+    default_hooks=[
+        'config-changed', 'upgrade-charm',
+        'amqp-relation-broken', 'amqp-relation-changed', 'amqp-relation-joined',
+        'cache-relation-broken', 'cache-relation-changed', 'cache-relation-joined',
+        'django-settings-relation-broken', 'django-settings-relation-changed', 'django-settings-relation-joined',
+        'mongodb-relation-broken', 'mongodb-relation-changed', 'mongodb-relation-joined',
+        'mysql-relation-broken', 'mysql-relation-changed', 'mysql-relation-joined',
+        'mysql-root-relation-broken', 'mysql-root-relation-changed', 'mysql-root-relation-joined',
+        'mysql-shared-relation-broken', 'mysql-shared-relation-changed', 'mysql-shared-relation-joined',
+        'pgsql-relation-broken', 'pgsql-relation-changed', 'pgsql-relation-joined',
+        'redis-relation-broken', 'redis-relation-changed', 'redis-relation-joined',
+        'wsgi-relation-broken', 'wsgi-relation-changed', 'wsgi-relation-joined'
+    ])
+
+
[e-mail]()
 def install():
-
-    for retry in xrange(0,24):
-        if apt_get_install(CHARM_PACKAGES):
-            time.sleep(10)
-        else:
-            break
-
-    configure_and_install(django_version)
-
-    django_admin_cmd = find_django_admin_cmd()
-            
-    if extra_deb_pkgs:
-        apt_get_install(extra_deb_pkgs.split(','))
-
-    if extra_pip_pkgs:
-        for package in extra_pip_pkgs.split(','):
-            pip_install(package)
-
-    if repos_username:
-        m = re.match(".*://([^/]+)/.*", repos_url)
-        if m is not None:
-            repos_domain = m.group(1)
-            template_vars = {
-                'repos_domain': repos_domain,
-                'repos_username': repos_username,
-                'repos_password': repos_password
-            }
-            from os.path import expanduser
-            process_template('netrc.tmpl', template_vars, expanduser('~/.netrc'))
-        else:
-            juju_log(MSG_ERROR, '''Failed to process repos_username and repos_password:\n
-                                   cannot identify domain in URL {0}'''.format(repos_url))
-        
-    if vcs == 'hg' or vcs == 'mercurial':
-        run('hg clone %s %s' % (repos_url, vcs_clone_dir))
-    elif vcs == 'git' or vcs == 'git-core':
-        if repos_branch:
-            run('git clone %s -b %s %s' % (repos_url, repos_branch, vcs_clone_dir))
-        else:
-            run('git clone %s %s' % (repos_url, vcs_clone_dir))
-    elif vcs == 'bzr' or vcs == 'bazaar':
-        run('bzr branch %s %s' % (repos_url, vcs_clone_dir))
-    elif vcs == 'svn' or vcs == 'subversion':
-        run('svn co %s %s' % (repos_url, vcs_clone_dir))
-    elif vcs == '' and repos_url == '':
-        juju_log(MSG_INFO, "No version control using django-admin startproject")
-        cmd = '%s startproject' % django_admin_cmd
-        if project_template_url:
-            cmd = " ".join([cmd, '--template', project_template_url])
-        if project_template_extension:
-            cmd = " ".join([cmd, '--extension', project_template_extension])
-        try:
-            run('%s %s %s' % (cmd, sanitized_unit_name, install_root), exit_on_error=False)
-        except subprocess.CalledProcessError:
-            run('%s %s' % (cmd, sanitized_unit_name), cwd=install_root)
-
-    else:
-        juju_log(MSG_ERROR, "Unknown version control")
-        sys.exit(1)
-
-    run('chown -R %s:%s %s' % (wsgi_user,wsgi_group, working_dir))
-
-    install_dir(settings_dir_path, owner=wsgi_user, group=wsgi_group, mode=0755)
-    install_dir(urls_dir_path, owner=wsgi_user, group=wsgi_group, mode=0755)
-
-    #FIXME: Upgrades/pulls will mess those files
-
-    for path, dir in ((settings_py_path, 'juju_settings'), (urls_py_path, 'juju_urls')):
-        append_template('conf_injection.tmpl', {'dir': dir}, path)
-
-    if requirements_pip_files:
-       for req_file in requirements_pip_files.split(','):
-            pip_install_req(os.path.join(working_dir,req_file))
-
-    wsgi_py_path = os.path.join(working_dir, 'wsgi.py')
-    if not os.path.exists(wsgi_py_path):
-        process_template('wsgi.py.tmpl', {'project_name': sanitized_unit_name, \
-                                          'django_settings': django_settings}, \
-                                          wsgi_py_path)
-
-def start():
-    if os.path.exists(os.path.join('/etc/init/', sanitized_unit_name + '.conf')):
-        run("service %s restart || service %s start" % (sanitized_unit_name, sanitized_unit_name))
-
-def stop():
-    if os.path.exists(os.path.join('/etc/init/', sanitized_unit_name + '.conf')):
-        run('service %s stop' % sanitized_unit_name)
-
-def config_changed(config_data):
-    os.environ['DJANGO_SETTINGS_MODULE'] = django_settings_modules
-    django_admin_cmd = find_django_admin_cmd()
-
-    site_secret_key = config_data['site_secret_key']
-    if not site_secret_key:
-        site_secret_key = ''.join([choice('abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)') for i in range(50)])
-
-    process_template('secret.tmpl', {'site_secret_key': site_secret_key}, settings_secret_path)
-
-    # Trigger WSGI reloading
-    for relid in relation_ids('wsgi'):
-        relation_set({'wsgi_timestamp': time.time()}, relation_id=relid)
-
-def upgrade():
-    if extra_pip_pkgs:
-        for package in extra_pip_pkgs.split(','):
-            pip_install(package, upgrade=True)
-
-    apt_get_update()
-    for retry in xrange(0,24):
-        if apt_get_install(CHARM_PACKAGES):
-            time.sleep(10)
-        else:
-            break
-
-    if vcs == 'hg' or vcs == 'mercurial':
-        run('hg pull %s %s' % (repos_url, vcs_clone_dir))
-    elif vcs == 'git' or vcs == 'git-core':
-        if repos_branch:
-            run('git pull %s -b %s %s' % (repos_url, repos_branch, vcs_clone_dir))
-        else:
-            run('git pull %s %s' % (repos_url, vcs_clone_dir))
-    elif vcs == 'bzr' or vcs == 'bazaar':
-        run('bzr pull %s %s' % (repos_url, vcs_clone_dir))
-    elif vcs == 'svn' or vcs == 'subversion':
-        run('svn up %s %s' % (repos_url, vcs_clone_dir))
-    else:
-        juju_log(MSG_ERROR, "Unknown version control")
-        sys.exit(1)
-
-    run('chown -R %s:%s %s' % (wsgi_user,wsgi_group, working_dir))
-
-    if requirements_pip_files:
-       for req_file in requirements_pip_files.split(','):
-            pip_install_req(os.path.join(working_dir,req_file), upgrade=True)
-
-
-    # Trigger WSGI reloading
-    for relid in relation_ids('wsgi'):
-       relation_set({'wsgi_timestamp': time.time()}, relation_id=relid)
-
-    for relid in relation_ids('django-settings'):
-       relation_set({'django_settings_timestamp': time.time()}, relation_id=relid)
-    
-
-def django_settings_relation_joined_changed():
-    os.environ['DJANGO_SETTINGS_MODULE'] = '.'.join([sanitized_unit_name, 'settings'])
-    django_admin_cmd = find_django_admin_cmd()
-
-    relation_set({'settings_dir_path': settings_dir_path,
-                  'urls_dir_path': urls_dir_path,
-                  'install_root': install_root,
-                  'django_admin_cmd': django_admin_cmd,
-                  'wsgi_user': wsgi_user,
-                  'wsgi_group': wsgi_group,
-                 })
-
-    run('chown -R %s:%s %s' % (wsgi_user,wsgi_group, working_dir))
-
-    # Trigger WSGI reloading
-    for relid in relation_ids('wsgi'):
-        relation_set({'wsgi_timestamp': time.time()}, relation_id=relid)
-
-def django_settings_relation_broken():
-    pass
-
-def pgsql_relation_joined_changed():
-    os.environ['DJANGO_SETTINGS_MODULE'] = '.'.join([sanitized_unit_name, 'settings'])
-    django_admin_cmd = find_django_admin_cmd()
-
-    packages = ["python-psycopg2", "postgresql-client"]
-    apt_get_install(packages)
-
-    database = relation_get("database")
-    if not database:
-        return
-
-    templ_vars = {
-       'db_engine': 'django.db.backends.postgresql_psycopg2',
-       'db_database': database,
-       'db_user': relation_get("user"),
-       'db_password': relation_get("password"),
-       'db_host': relation_get("host"),
-    }
-
-    process_template('engine.tmpl', templ_vars, settings_database_path % {'engine_name': 'pgsql'})
-
-    run("%s syncdb --noinput --pythonpath=%s --settings=%s || true" % \
-            (django_admin_cmd, install_root, django_settings_modules))
-
-
-    run('chown -R %s:%s %s' % (wsgi_user,wsgi_group, working_dir))
-
-    # Trigger WSGI reloading
-    for relid in relation_ids('wsgi'):
-        relation_set({'wsgi_timestamp': time.time()}, relation_id=relid)
-
-def pgsql_relation_broken():
-    run('rm %s' % settings_database_path % {'engine_name': 'pgsql'})
-
-    # Trigger WSGI reloading
-    for relid in relation_ids('wsgi'):
-        relation_set({'wsgi_timestamp': time.time()}, relation_id=relid)
-
-def mongodb_relation_joined_changed():
-    packages = ["python-mongoengine"]
-    apt_get_install(packages)
-
-    database = relation_get("database")
-    if not database:
-        return
-
-    templ_vars = {
-       'db_database': database,
-       'db_host': relation_get("host"),
-    }
-
-    process_template('mongodb_engine.tmpl', templ_vars, settings_database_path % {'engine_name': 'mongodb'})
-
-    run('chown -R %s:%s %s' % (wsgi_user,wsgi_group, working_dir))
-
-    # Trigger WSGI reloading
-    for relid in relation_ids('wsgi'):
-        relation_set({'wsgi_timestamp': time.time()}, relation_id=relid)
-
-def mongodb_relation_broken():
-    run('rm %s' % settings_database_path % {'engine_name': 'mongodb'})
-
-    # Trigger WSGI reloading
-    for relid in relation_ids('wsgi'):
-        relation_set({'wsgi_timestamp': time.time()}, relation_id=relid)
-
-def wsgi_relation_joined_changed():
-    relation_set({'working_dir':working_dir})
-
-    for var in config_data:
-        if var.startswith('wsgi_') or var in ['listen_ip', 'port']:
-            relation_set({var: config_data[var]})
-    
-    if not config_data['python_path']:
-        relation_set({'python_path': install_root})
-
-    open_port(config_data['port'])
-
-def wsgi_relation_broken():
-    close_port(config_data['port'])
-
-def cache_relation_joined_changed():
-    os.environ['DJANGO_SETTINGS_MODULE'] = django_settings_modules
-
-    packages = ["python-memcache"]
-    apt_get_install(packages)
-
-    host = relation_get("host")
-    if not host:
-        return
-
-    templ_vars = {
-       'cache_engine': 'django.core.cache.backends.memcached.MemcachedCache',
-       'cache_host': relation_get("host"),
-       'cache_port': relation_get("port"),
-    }
-
-    process_template('cache.tmpl', templ_vars, settings_database_path % {'engine_name': 'memcache'})
-
-    run('chown -R %s:%s %s' % (wsgi_user,wsgi_group, working_dir))
-
-
-    # Trigger WSGI reloading
-    for relid in relation_ids('wsgi'):
-        relation_set({'wsgi_timestamp': time.time()}, relation_id=relid)
-
-def cache_relation_broken():
-    run('rm %s' % settings_database_path % {'engine_name': 'memcache'})
-
-    # Trigger WSGI reloading
-    for relid in relation_ids('wsgi'):
-        relation_set({'wsgi_timestamp': time.time()}, relation_id=relid)
-
-def website_relation_joined_changed():
-    relation_set({'port': config_data["port"], 'hostname': get_unit_host()})
-
-def website_relation_broken():
-    pass
-
-###############################################################################
-# Global variables
-###############################################################################
-config_data = config_get()
-juju_log(MSG_DEBUG, "got config: %s" % str(config_data))
-
-django_version = config_data['django_version']
-vcs = config_data['vcs']
-repos_url = config_data['repos_url']
-repos_username = config_data['repos_username']
-repos_password = config_data['repos_password']
-repos_branch = config_data['repos_branch']
-
-project_template_extension = config_data['project_template_extension']
-project_template_url = config_data['project_template_url']
-
-extra_deb_pkgs = config_data['additional_distro_packages']
-extra_pip_pkgs = config_data['additional_pip_packages']
-requirements_pip_files = config_data['requirements_pip_files']
-wsgi_user = config_data['wsgi_user']
-wsgi_group = config_data['wsgi_group']
-install_root = config_data['install_root']
-application_path = config_data['application_path']
-django_settings = config_data['django_settings']
-
-unit_name = os.environ['JUJU_UNIT_NAME'].split('/')[0]
-sanitized_unit_name = sanitize(unit_name)
-vcs_clone_dir = os.path.join(install_root, sanitized_unit_name)
-if application_path:
-    working_dir = os.path.join(vcs_clone_dir, application_path)
-else:
-    working_dir = vcs_clone_dir
-
-django_settings_modules = '.'.join([sanitized_unit_name, django_settings])
-django_run_dir = os.path.join(working_dir, "run/")
-django_logs_dir = os.path.join(working_dir, "logs/")
-settings_py_path = os.path.join(working_dir, 'settings.py')
-urls_py_path = os.path.join(working_dir, 'urls.py')
-settings_dir_path = os.path.join(working_dir, config_data["settings_dir_name"])
-urls_dir_path = os.path.join(working_dir, config_data["urls_dir_name"])
-settings_secret_path = os.path.join(working_dir, config_data["settings_secret_key_path"])
-settings_database_path = os.path.join(working_dir, config_data["settings_database_path"])
-hook_name = os.path.basename(sys.argv[0])
-
-###############################################################################
-# Main section
-###############################################################################
-def main():
-    juju_log(MSG_INFO, "Running {} hook".format(hook_name))
-    if hook_name == "install":
-        install()
-
-    elif hook_name == "start":
-       start()
-
-    elif hook_name == "stop":
-       stop()
-
-    elif hook_name == "config-changed":
-       config_changed(config_data)
-
-    elif hook_name == "upgrade-charm":
-        upgrade()
-        config_changed(config_data)
-
-    elif hook_name in ["django-settings-relation-joined", "django-settings-relation-changed"]:
-        django_settings_relation_joined_changed()
-        config_changed(config_data)
-
-    elif hook_name == "django-settings-relation-broken":
-        django_settings_relation_broken()
-        config_changed(config_data)
-
-    elif hook_name in ["pgsql-relation-joined", "pgsql-relation-changed"]:
-        pgsql_relation_joined_changed()
-        config_changed(config_data)
-
-    elif hook_name == "pgsql-relation-broken":
-        pgsql_relation_broken()
-        config_changed(config_data)
-
-    elif hook_name in ["mongodb-relation-joined", "mongodb-relation-changed"]:
-        mongodb_relation_joined_changed()
-        config_changed(config_data)
-
-    elif hook_name == "mongodb-relation-broken":
-        mongodb_relation_broken()
-        config_changed(config_data)
-
-    elif hook_name in ["wsgi-relation-joined", "wsgi-relation-changed"]:
-        wsgi_relation_joined_changed()
-
-    elif hook_name == "wsgi-relation-broken":
-        wsgi_relation_broken()
-
-    elif hook_name in ["cache-relation-joined", "cache-relation-changed"]:
-        cache_relation_joined_changed()
-
-    elif hook_name == "cache-relation-broken":
-        cache_relation_broken()
-
-    elif hook_name in ["website-relation-joined", "website-relation-changed"]:
-        website_relation_joined_changed()
-
-    elif hook_name == "website-relation-broken":
-        website_relation_broken()
-
-
-    else:
-        print "Unknown hook {}".format(hook_name)
-        raise SystemExit(1)
-
-
-if __name__ == '__main__':
-    raise SystemExit(main())
+    """Install ansible.
+
+    The hook() helper decorating this install function ensures that after this
+    function finishes, any tasks in the playbook tagged with install are
+    executed.
+    """
+    charmhelpers.contrib.ansible.install_ansible_support(from_ppa=True)
+
+
+if __name__ == "__main__":
+        hooks.execute(sys.argv)

=== added symlink 'hooks/mysql-relation-broken'
=== target is u'hooks.py'
=== added symlink 'hooks/mysql-relation-changed'
=== target is u'hooks.py'
=== added symlink 'hooks/mysql-relation-joined'
=== target is u'hooks.py'
=== added symlink 'hooks/mysql-root-relation-broken'
=== target is u'hooks.py'
=== added symlink 'hooks/mysql-root-relation-changed'
=== target is u'hooks.py'
=== added symlink 'hooks/mysql-root-relation-joined'
=== target is u'hooks.py'
=== added symlink 'hooks/mysql-shared-relation-broken'
=== target is u'hooks.py'
=== added symlink 'hooks/mysql-shared-relation-changed'
=== target is u'hooks.py'
=== added symlink 'hooks/mysql-shared-relation-joined'
=== target is u'hooks.py'
=== added symlink 'hooks/redis-relation-broken'
=== target is u'hooks.py'
=== added symlink 'hooks/redis-relation-changed'
=== target is u'hooks.py'
=== added symlink 'hooks/redis-relation-joined'
=== target is u'hooks.py'
=== added file 'hooks/start'
--- hooks/start	1970-01-01 00:00:00 +0000
+++ hooks/start	2014-07-07 20:28:28 +0000
@@ -0,0 +1,1 @@
+#!/bin/sh

=== removed symlink 'hooks/start'
=== target was u'hooks.py'
=== added file 'hooks/stop'
--- hooks/stop	1970-01-01 00:00:00 +0000
+++ hooks/stop	2014-07-07 20:28:28 +0000
@@ -0,0 +1,1 @@
+#!/bin/sh

=== removed symlink 'hooks/stop'
=== target was u'hooks.py'
=== removed symlink 'hooks/website-relation-broken'
=== target was u'hooks.py'
=== removed symlink 'hooks/website-relation-changed'
=== target was u'hooks.py'
=== removed symlink 'hooks/website-relation-joined'
=== target was u'hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2013-06-04 19:05:59 +0000
+++ metadata.yaml	2014-07-07 20:28:28 +0000
@@ -1,7 +1,7 @@
 name: python-django
 summary: High-level Python web development framework
 maintainer: Patrick Hetu <[e-mail]>
-categories: ['databases', 'app-servers']
+categories: ['app-servers']
 description: |
   This charm will install Django. It can also install your Django
   project and his dependencies from either a template or from a
@@ -23,9 +23,25 @@
   pgsql:
     interface: pgsql
     optional: true
+  mysql:
+    interface: mysql
+    optional: true
+  mysql-root:
+    interface: mysql-root
+  mysql-shared:
+    interface: mysql-shared
   mongodb:
     interface: mongodb
     optional: true
+  redis:
+    interface: redis
+    optional: true
+  amqp:
+    interface: rabbitmq
+    optional: true
   cache:
     interface: memcache
     optional: true
+  lander-jenkins:
+    interface: lander-jenkins
+    optional: true

=== added directory 'playbooks'
=== added directory 'playbooks/roles'
=== added file 'playbooks/roles/README.md'
--- playbooks/roles/README.md	1970-01-01 00:00:00 +0000
+++ playbooks/roles/README.md	2014-07-07 20:28:28 +0000
@@ -0,0 +1,4 @@
+charm-ansible-roles
+===================
+
+Reusable ansible roles for creating your juju charms with ansible

=== added directory 'playbooks/roles/aptkit'
=== added directory 'playbooks/roles/aptkit/defaults'
=== added file 'playbooks/roles/aptkit/defaults/main.yml'
--- playbooks/roles/aptkit/defaults/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/aptkit/defaults/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,18 @@
+# List of extra package sources
+# YAML format.
+install_sources: ''
+
+# List of signing keys for install_sources package sources
+# YAML format.
+install_keys: ''
+
+# Comma separated extra packages to install.
+additional_distro_packages: ""
+
+# Comma separated relative paths to requirement files. Note that the charm
+# won't manually upgrade packages defined in this file.
+# Leave the variable to an empty string if you don't want the feature.
+requirements_apt_files: ""
+
+# where to search for requirements_apt_files
+requirements_apt_dir: ""

=== added directory 'playbooks/roles/aptkit/tasks'
=== added file 'playbooks/roles/aptkit/tasks/main.yml'
--- playbooks/roles/aptkit/tasks/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/aptkit/tasks/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,31 @@
+- name: Add APT keys by url
+  apt_key: url="{{ item }}" state=present
+  with_lines: echo "{{ install_keys }}" | tr "," "\n" | awk "/^http/"
+  when: install_keys != ''
+
+- name: Add APT keys by file
+  apt_key: file="{{ item }}" state=present
+  with_lines: echo "{{ install_keys }}" | tr "," "\n" | awk "/^\//"
+  when: install_keys != ''
+
+- name: Add APT keys by data
+  apt_key: data="{{ item }}" state=present
+  with_lines: echo "{{ install_keys }}" | tr "," "\n" | awk "! /^\//" | awk "! /^http/"
+  when: install_keys != ''
+
+- name: Add APT respositories
+  apt_repository: repo="{{ item }}" state=present
+  with_items: install_sources
+  when: install_sources != ''
+
+- name: Install additional_distro_packages
+  apt: pkg="{{ item }}" state=latest update_cache=yes
+  with_items: additional_distro_packages.split(',')
+  register: result
+  until: result|success
+  retries: 24
+  delay: 10
+
+
+
+#requirements_apt_files

=== added directory 'playbooks/roles/django-app'
=== added directory 'playbooks/roles/django-app/handlers'
=== added file 'playbooks/roles/django-app/handlers/main.yml'
--- playbooks/roles/django-app/handlers/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-app/handlers/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,7 @@
+- name: Restart wsgi
+  # Trigger the wsgi subordinate to restart by changing settings.
+  command: >
+    relation-set -r {{ item.key }}
+    wsgi_timestamp={{ ansible_date_time.iso8601_micro }}
+  when: relations['wsgi']
+  with_dict: relations['wsgi']

=== added directory 'playbooks/roles/django-app/tasks'
=== added file 'playbooks/roles/django-app/tasks/main.yml'
--- playbooks/roles/django-app/tasks/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-app/tasks/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,67 @@
+#   python_path={{ python_path_list }}
+#   settings_dir_path={{ settings_dir_path }}
+#   settings_module={{ settings_module }}
+#   urls_dir_path={{ urls_dir_path }}
+#   working_dir={{ working_dir }}
+#   django_admin_cmd={{ django_admin_cmd.stdout }}
+#   wsgi_user={{ wsgi_user }}
+#   wsgi_group={{ wsgi_group }}
+
+- name: get pwd
+  command: pwd
+  register: pwd
+
+- name: Install distro dependencies
+  apt: pkg="{{ item }}" state=latest update_cache=yes
+  with_items: distro_packages
+  register: result
+  until: result|success
+  retries: 24
+  delay: 10
+  when: distro_packages is defined
+
+- name: Install pip dependencies
+  pip: name="{{ item }}" extra_args="{{ pip_extra_args }}"
+  with_items: pip_packages
+  when: pip_packages is defined
+
+- name: Install settings template
+  template:
+    owner="{{ settings_template.owner }}"
+    group="{{ settings_template.group }}"
+    mode="{{ settings_template.mode | default('0640') }}"
+    dest="{{ settings_template.dest | default(settings_dest) }}"
+    src="{{ item }}"
+  with_first_found:
+    - files:
+        - "{{ settings_template.src }}"
+        - "{{ relation_name }}.py.j2"
+        - settings.py.j2
+      paths:
+        - "{{ pwd.stdout }}/templates"
+        - "{{ pwd.stdout }}/roles/django-app/templates"
+  when: settings_template is defined
+
+- name: Install urls template
+  template:
+    owner="{{ urls_template.owner }}"
+    group="{{ urls_template.group }}"
+    mode="{{  urls_template.mode | default('0640') }}"
+    dest="{{ urls_template.dest | default(urls_dest) }}"
+    src="{{ item }}"
+  with_first_found:
+    - files:
+        - "{{ urls_template.src }}"
+        - "{{ relation_name }}.py.j2"
+        - "{{ relation_name }}.py.j2"
+        - urls.py.j2
+      paths:
+        - "{{ pwd.stdout }}/templates"
+        - "{{ pwd.stdout }}/roles/django-app/templates"
+  when: urls_template is defined
+
+- name: Run django commands
+  shell: PYTHONPATH={{ python_path_list }} {{ django_admin_cmd.stdout }} {{ item }} --settings {{ settings_module }} chdir={{ install_root }}
+  with_items: commands
+  ignore_errors: True
+  when: commands is defined

=== added directory 'playbooks/roles/django-app/templates'
=== added file 'playbooks/roles/django-app/templates/amqp.py.j2'
--- playbooks/roles/django-app/templates/amqp.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-app/templates/amqp.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,13 @@
+import djcelery
+djcelery.setup_loader()
+
+# FIXME celery_amqp_vhost config
+BROKER_URL = 'amqp://{{ current_relation.username }}:{{ current_relation.password }}@{{ current_relation.hostname }}:5672/{{ sanitized_unit_name }}'
+
+#CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend',
+
+CELERY_ALWAYS_EAGER = {{ celery_always_eager }}
+
+INSTALLED_APPS += (
+   'djcelery',
+)

=== added file 'playbooks/roles/django-app/templates/cache.py.j2'
--- playbooks/roles/django-app/templates/cache.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-app/templates/cache.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,10 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '{{ current_relation.host }}:{{ current_relation.port }}',
+    }
+}

=== added file 'playbooks/roles/django-app/templates/cloudfiles.py.j2'
--- playbooks/roles/django-app/templates/cloudfiles.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-app/templates/cloudfiles.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,48 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+import os
+
+PROJECT_ROOT = os.path.dirname(__file__)
+
+class SwiftAuthentication(object):
+    """Auth container to pass CloudFiles storage URL and token from
+    session.
+    """
+    def __init__(self, auth_url, username, password, tenant_id):
+        self.auth_url = auth_url
+        self.username = username
+        self.password = password
+        self.tenant_id = tenant_id
+
+    def authenticate(self):
+        from keystoneclient.v2_0 import client as ksclient
+        _ksclient = ksclient.Client(username=self.username,
+                                    password=self.password,
+                                    tenant_id=self.tenant_id,
+                                    auth_url=self.auth_url)
+        endpoint = _ksclient.service_catalog.url_for(service_type='object-store',
+                        endpoint_type='publicURL')
+
+        return (endpoint, '', _ksclient.auth_token)
+
+auth = SwiftAuthentication('$SWIFT_AUTH_URL', '$SWIFT_USERNAME', '$SWIFT_PASSWORD', '$SWIFT_TENANTID')
+
+MEDIA_URL = "$SWIFT_ENDPOINT_URL/$SWIFT_VERSION/$SWIFT_TENANTID/$SWIFT_CONTAINER_NAME/uploads/"
+
+ADMIN_MEDIA_PREFIX = '$SWIFT_ENDPOINT_URL/$SWIFT_VERSION/$SWIFT_TENANTID/$SWIFT_CONTAINER_NAME/static/admin/'
+
+STATICFILES_URL = '$SWIFT_ENDPOINT_URL/$SWIFT_VERSION/$SWIFT_TENANTID/$SWIFT_CONTAINER_NAME/static/'
+STATIC_URL =  STATICFILES_URL
+
+DEFAULT_FILE_STORAGE = 'cumulus.storage.CloudFilesStorage'
+STATICFILES_STORAGE = 'cumulus.storage.CloudFilesStaticStorage'
+
+CUMULUS = {
+    'CONNECTION_ARGS': {'auth' : auth},
+    'CONTAINER': '$SWIFT_CONTAINER_NAME'
+}
+
+COMPRESS_STORAGE = "cumulus.storage.CachedCloudFilesStaticStorage"
+

=== added file 'playbooks/roles/django-app/templates/mongodb.py.j2'
--- playbooks/roles/django-app/templates/mongodb.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-app/templates/mongodb.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,8 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+MONGO_DB = {
+    'host': '{{ current_relation.host }}',
+    'port': {{ current_relation.port }},
+}

=== added file 'playbooks/roles/django-app/templates/mysql.py.j2'
--- playbooks/roles/django-app/templates/mysql.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-app/templates/mysql.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,18 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+DATABASES = {
+    "default": {
+        "ENGINE": 'django.db.backends.mysql',
+        "NAME": '{{ current_relation.database }}',
+        "USER": '{{ current_relation.user }}',
+        "PASSWORD": '{{ current_relation.password }}',
+        "HOST": '{{ current_relation.host }}',
+        "PORT": '',
+    }
+}
+
+# Backward compatibility
+DATABASE_ENGINE=DATABASES
+

=== added file 'playbooks/roles/django-app/templates/pgsql.py.j2'
--- playbooks/roles/django-app/templates/pgsql.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-app/templates/pgsql.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,19 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+DATABASES = {
+    "default": {
+        "ENGINE": 'django.db.backends.postgresql_psycopg2',
+        "NAME": '{{ current_relation.database }}',
+        "USER": '{{ current_relation.user }}',
+        "PASSWORD": '{{ current_relation.password }}',
+        "HOST": '{{ current_relation.host }}',
+        "PORT": '',
+        "OPTIONS": {'autocommit': True},
+    }
+}
+
+# Backward compatibility
+DATABASE_ENGINE=DATABASES
+

=== added file 'playbooks/roles/django-app/templates/redis.py.j2'
--- playbooks/roles/django-app/templates/redis.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-app/templates/redis.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+REDIS = {
+    'host': '{{ current_relation.hostname }}',
+    'port': {{ current_relation.port }},
+    'db': 0,
+}

=== added directory 'playbooks/roles/django-app/vars'
=== added file 'playbooks/roles/django-app/vars/main.yml'
--- playbooks/roles/django-app/vars/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-app/vars/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,2 @@
+settings_dest: "{{ settings_template.settings_dir_path | default(working_dir) }}/{{ settings_template.priority | default('60') }}-{{ relation_name | default('unknown') }}.py"
+urls_dest: "{{ urls_template.urls_dir_path | default(working_dir) }}/{{ urls_template.priority | default('60') }}-{{ relation_name | default('unknown') }}.py"

=== added directory 'playbooks/roles/django-project'
=== added directory 'playbooks/roles/django-project/defaults'
=== added file 'playbooks/roles/django-project/defaults/main.yml'
--- playbooks/roles/django-project/defaults/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-project/defaults/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,64 @@
+# The web site secret key. Leave empty will generate one.
+# NOTE:  You **NEED** to set this in a multi-units architecture or you will
+# have some trouble.
+site_secret_key: ''
+
+# Version or origin from which to install.  May be one of the following:
+# distro (default), ppa: somecustom/ppa, a deb url sources entry or
+# a valid pip line like 'Django' or 'Django==1.5' or a reposiroty url (without the -e).
+# Leaving it empty if you don't want the charm to install Django.
+django_version: "distro"
+
+# If not repository url is found, the charm will create a new project. This
+# option is the --template argument value for the startproject command
+# to use a custom project template.
+#
+# Django will also accept URLs (http, https, ftp) to compressed
+# archives with the app template files, downloading and extracting them on the fly.
+# For more informations see:
+#   https: //docs.djangoproject.com/en/dev/ref/django-admin/#startproject-projectname-destination
+project_template_url: ""
+
+# When Django copies the project template files, it also renders certain
+# files through the template engine:  the files whose extensions match the
+# --extension option (py by default) and the files whose names are passed with
+# the --name option.
+project_template_extension: ""
+
+# The root directory to checkout to.
+install_root: "/srv/"
+
+# The relative path to install_root where the manage.py
+# script is located.
+application_path: ""
+
+# base64 encoded string to hold configuration information for the unit.
+# The contents will be written to a file named
+#  <install_root>/<unit>/unit_config
+# where <unit> is the location the branch is extracted to.
+unit_config: ""
+
+# The Python path to your Django settings module.
+# Leave it empty if your settings file is at the root of your repos.
+django_settings: ""
+
+# Enable the use of south migrations
+django_south: False
+
+# Version or origin from which to install.  May be one of the following:
+# distro (default), ppa: somecustom/ppa, a deb url sources entry or
+# a valid pip line like 'South' or 'South==0.8.4' or a reposiroty url (without the -e).
+# Leaving it empty if you don't want the charm to install South.
+django_south_version: "distro"
+
+# Enable disable settings.DEBUG for django
+django_debug: False
+
+# A space separated list for settings.ALLOWED_HOSTS in django. Default
+# value will be the hostname, fully-qualified name, and public IP.
+django_allowed_hosts: ""
+
+# Allows setting up extra settings.* values for Django. Acceptable
+# values are limited to comma delimited key-value pairs like:
+#   SETTING_X=foo, SETTING_Y=bar
+django_extra_settings: ""

=== added directory 'playbooks/roles/django-project/tasks'
=== added file 'playbooks/roles/django-project/tasks/dynamic_vars.yml'
--- playbooks/roles/django-project/tasks/dynamic_vars.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-project/tasks/dynamic_vars.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,45 @@
+- name: set sanitized_unit_name
+  set_fact: sanitized_unit_name="{{ local_unit | regex_replace('^(.*)/.*$', '\\1') | regex_replace('-', '_') }}"
+
+- name: get relation name
+  set_fact: relation_name="{{ ansible_env.JUJU_RELATION | regex_replace('(.*)-relation-.*','\\\\1') }}"
+  when: ansible_env.JUJU_RELATION is defined
+
+- name: set working_dir if application_path != ''
+  set_fact: working_dir="{{ vcs_clone_dir }}/{{ application_path }}"
+  when: application_path != ''
+
+- name: set working_dir if application_path == ''
+  set_fact: working_dir="{{ vcs_clone_dir }}"
+  when: application_path == ''
+
+- name: set python_path_list if python_path != ''
+  set_fact: python_path_list="{{ working_dir }}/../:{{ python_path }}"
+  when: python_path != ''
+
+- name: set python_path_list if python_path == ''
+  set_fact: python_path_list="{{ working_dir }}/../"
+  when: python_path == ''
+
+- name: set settings_module if django_settings != ''
+  set_fact: settings_module="{{ django_settings }}"
+  when: django_settings != ''
+
+- name: set settings_module if django_settings == ''
+  set_fact: settings_module="{{ working_dir | basename }}.settings"
+  when: django_settings == ''
+
+- name: Generate the secret key if none is provided
+  command: pwgen -s 51 1
+  register: pwgen_site_secret_key
+  when: site_secret_key == ''
+
+- name: set site_secret_key with pwgen_site_secret_key
+  set_fact: site_secret_key="{{ pwgen_site_secret_key.stdout }}"
+  when: site_secret_key == ''
+
+- name: Found the django-admin script
+  shell: command -v /usr/bin/django-admin || command -v /usr/local/bin/django-admin.py
+  register: django_admin_cmd
+  ignore_errors: True
+

=== added file 'playbooks/roles/django-project/tasks/main.yml'
--- playbooks/roles/django-project/tasks/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-project/tasks/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,42 @@
+---
+
+# Django
+- name: Install the Django debian package
+  apt: pkg=python-django state=latest update_cache=yes
+  when: django_version == 'distro'
+
+# or
+
+- name: Install Django pip package
+  pip: name="{{ django_version }}" state=latest
+  when: django_version != 'distro' and django_version != ''
+
+
+# South
+- name: Install the South debian package
+  apt: pkg=python-django-south state=latest update_cache=yes
+  when: django_south_version == 'distro'
+
+# or
+
+- name: Install the South pip package
+  pip: name="{{ django_south_version }}" state=latest
+  when: django_south_version != 'distro' and django_south_version != ''
+
+- include: dynamic_vars.yml
+
+# Django startproject for version >= 1.4
+- name: Create a Django project
+  shell: PYTHONPATH={{ python_path_list }} {{ django_admin_cmd.stdout }} startproject {{ sanitized_unit_name }} {{ install_root }} --template {{ project_template_url }} --extension {{ project_template_extension }}
+  when: vcs == ''
+  register: test_install_root
+  ignore_errors: True
+
+# Django startproject for version <= 1.3
+- name: Create a Django project
+  shell: PYTHONPATH={{ python_path_list }} {{ django_admin_cmd.stdout }} startproject {{ sanitized_unit_name }}
+  args:
+    chdir: "{{ install_root }}"
+  when: test_install_root|failed and vcs == ''
+
+

=== added directory 'playbooks/roles/django-project/vars'
=== added file 'playbooks/roles/django-project/vars/main.yml'
--- playbooks/roles/django-project/vars/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-project/vars/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,3 @@
+vcs_clone_dir: "{{ install_root }}/{{ sanitized_unit_name }}"
+urls_dir_path: "{{ working_dir }}/{{ urls_injection_path | dirname }}/{{ urls_dir_name }}"
+settings_dir_path: "{{ working_dir }}/{{ settings_injection_path | dirname }}/{{ settings_dir_name }}"

=== added directory 'playbooks/roles/django-settings-injection'
=== added directory 'playbooks/roles/django-settings-injection/handlers'
=== added file 'playbooks/roles/django-settings-injection/handlers/main.yml'
--- playbooks/roles/django-settings-injection/handlers/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/handlers/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,16 @@
+- name: Restart wsgi
+  # Trigger the wsgi subordinate to restart by changing settings.
+  command: >
+    relation-set -r {{ item.key }}
+    wsgi_timestamp={{ ansible_date_time.iso8601_micro }}
+  when: relations['wsgi']
+  with_dict: relations['wsgi']
+
+- name: syncdb
+  shell: PYTHONPATH={{ python_path_list }} {{ django_admin_cmd.stdout }} syncdb --noinput --settings {{ settings_module }} chdir={{ install_root }}
+  ignore_errors: True
+
+- name: migrate
+  shell: PYTHONPATH={{ python_path_list }} {{ django_admin_cmd.stdout }} migrate --settings {{ settings_module }} chdir={{ install_root }}
+  when: django_south
+  ignore_errors: True

=== added directory 'playbooks/roles/django-settings-injection/tasks'
=== added file 'playbooks/roles/django-settings-injection/tasks/main.yml'
--- playbooks/roles/django-settings-injection/tasks/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/tasks/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,73 @@
+---
+
+# settings injection
+# FIXME see: https://github.com/ansible/ansible/issues/5679
+- name: Make conf directory for injections
+  command: mkdir {{ working_dir }}/{{ settings_injection_path | dirname }}/{{ settings_dir_name }} creates={{ working_dir }}/{{ settings_injection_path | dirname }}/{{ settings_dir_name }}
+  when: settings_dir_name != ''
+
+- name: Test for settings injections
+  command: grep "# The following is the import code for the settings directory injected by Juju" {{ settings_py_path }} chdir={{ working_dir }}/{{ settings_injection_path | dirname }}/{{ settings_dir_name }}
+  register: result_settings_injections
+  ignore_errors: True
+  when: settings_dir_name != ''
+
+- name: Create settings injection template
+  template: dest=/tmp/conf_injection.py src=conf_injection.py.j2
+  when: result_settings_injections|failed and settings_dir_name != ''
+
+- name: Inject settings
+  shell: cat /tmp/conf_injection.py >> {{ settings_py_path }} chdir={{ working_dir }}/{{ settings_injection_path | dirname }}/{{ settings_dir_name }}
+  when: result_settings_injections|failed
+
+- name: remove settings temporary template
+  command: rm /tmp/conf_injection.py
+  when: result_settings_injections|failed and settings_dir_name != ''
+
+# url injection
+# FIXME see: https://github.com/ansible/ansible/issues/5679
+- name: Make urls directory for injections
+  command: mkdir {{ working_dir }}/{{ urls_injection_path | dirname }}/{{ urls_dir_name }} creates={{ working_dir }}/{{ urls_injection_path | dirname }}/{{ urls_dir_name }}
+  when: urls_dir_name != ''
+
+- name: Test for urls injections
+  command: grep "# The following is the import code for the urls directory injected by Juju" {{ urls_py_path }} chdir={{ working_dir }}/{{ urls_injection_path | dirname }}/{{ urls_dir_name }}
+  register: result_urls_injections
+  ignore_errors: True
+  when: urls_dir_name != ''
+
+- name: Create urls injection template
+  template: dest=/tmp/urls_injection.py src=urls_injection.py.j2
+  when: result_urls_injections|failed and urls_dir_name != ''
+
+- name: Inject urls
+  shell: cat /tmp/urls_injection.py >> {{ urls_py_path }} chdir={{ working_dir }}/{{ urls_injection_path | dirname }}/{{ urls_dir_name }}
+  when: result_urls_injections|failed and urls_dir_name != ''
+
+- name: remove urls temporary template
+  command: rm /tmp/urls_injection.py
+  when: result_urls_injections|failed and urls_dir_name != ''
+
+- name: django-settings relation
+  command: >
+    relation-set
+    python_path={{ python_path_list }}
+    settings_dir_path={{ settings_dir_path }}
+    settings_module={{ settings_module }}
+    urls_dir_path={{ urls_dir_path }}
+    working_dir={{ working_dir }}
+    django_admin_cmd={{ django_admin_cmd.stdout }}
+    django_uid={{ django_uid }}
+    django_gid={{ django_gid }}
+  ignore_errors: True
+  when: django_admin_cmd.stdout is defined
+
+
+# permissions
+# FIXME use sudo django_uid
+- name: Set the right permissions for working_dir
+  file:
+    path={{ vcs_clone_dir }}
+    owner={{ django_uid }}
+    group={{ django_gid }}
+    recurse=yes state=directory

=== added directory 'playbooks/roles/django-settings-injection/templates'
=== added file 'playbooks/roles/django-settings-injection/templates/allowed_hosts.py.j2'
--- playbooks/roles/django-settings-injection/templates/allowed_hosts.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/allowed_hosts.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+ALLOWED_HOSTS = [
+{% for allowed_hosts in django_allowed_hosts.split(',') %}
+    '{{ allowed_hosts }}',
+{% endfor %}
+]

=== added file 'playbooks/roles/django-settings-injection/templates/amqp_celery.py.j2'
--- playbooks/roles/django-settings-injection/templates/amqp_celery.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/amqp_celery.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,13 @@
+import djcelery
+djcelery.setup_loader()
+
+# FIXME celery_amqp_vhost config
+BROKER_URL = 'amqp://{{ current_relation.username }}:{{ current_relation.password }}@{{ current_relation.hostname }}:5672/{{ sanitized_unit_name }}'
+
+#CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend',
+
+CELERY_ALWAYS_EAGER = {{ celery_always_eager }}
+
+INSTALLED_APPS += (
+   'djcelery',
+)

=== added file 'playbooks/roles/django-settings-injection/templates/cache.py.j2'
--- playbooks/roles/django-settings-injection/templates/cache.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/cache.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,10 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+CACHES = {
+    'default': {
+        'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+        'LOCATION': '{{ current_relation.host }}:{{ current_relation.port }}',
+    }
+}

=== added file 'playbooks/roles/django-settings-injection/templates/cloudfiles.py.j2'
--- playbooks/roles/django-settings-injection/templates/cloudfiles.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/cloudfiles.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,48 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+import os
+
+PROJECT_ROOT = os.path.dirname(__file__)
+
+class SwiftAuthentication(object):
+    """Auth container to pass CloudFiles storage URL and token from
+    session.
+    """
+    def __init__(self, auth_url, username, password, tenant_id):
+        self.auth_url = auth_url
+        self.username = username
+        self.password = password
+        self.tenant_id = tenant_id
+
+    def authenticate(self):
+        from keystoneclient.v2_0 import client as ksclient
+        _ksclient = ksclient.Client(username=self.username,
+                                    password=self.password,
+                                    tenant_id=self.tenant_id,
+                                    auth_url=self.auth_url)
+        endpoint = _ksclient.service_catalog.url_for(service_type='object-store',
+                        endpoint_type='publicURL')
+
+        return (endpoint, '', _ksclient.auth_token)
+
+auth = SwiftAuthentication('$SWIFT_AUTH_URL', '$SWIFT_USERNAME', '$SWIFT_PASSWORD', '$SWIFT_TENANTID')
+
+MEDIA_URL = "$SWIFT_ENDPOINT_URL/$SWIFT_VERSION/$SWIFT_TENANTID/$SWIFT_CONTAINER_NAME/uploads/"
+
+ADMIN_MEDIA_PREFIX = '$SWIFT_ENDPOINT_URL/$SWIFT_VERSION/$SWIFT_TENANTID/$SWIFT_CONTAINER_NAME/static/admin/'
+
+STATICFILES_URL = '$SWIFT_ENDPOINT_URL/$SWIFT_VERSION/$SWIFT_TENANTID/$SWIFT_CONTAINER_NAME/static/'
+STATIC_URL =  STATICFILES_URL
+
+DEFAULT_FILE_STORAGE = 'cumulus.storage.CloudFilesStorage'
+STATICFILES_STORAGE = 'cumulus.storage.CloudFilesStaticStorage'
+
+CUMULUS = {
+    'CONNECTION_ARGS': {'auth' : auth},
+    'CONTAINER': '$SWIFT_CONTAINER_NAME'
+}
+
+COMPRESS_STORAGE = "cumulus.storage.CachedCloudFilesStaticStorage"
+

=== added file 'playbooks/roles/django-settings-injection/templates/conf_injection.py.j2'
--- playbooks/roles/django-settings-injection/templates/conf_injection.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/conf_injection.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,18 @@
+#------------------------------------------------------------------------------
+# The following is the import code for the settings directory injected by Juju
+# Do not remove this comment
+#------------------------------------------------------------------------------
+
+import glob
+from os.path import abspath, dirname, join
+
+PROJECT_DIR = abspath(dirname(__file__))
+
+conffiles = glob.glob(join(PROJECT_DIR, '{{ settings_dir_name }}', '*.py'))
+conffiles.sort()
+
+if not 'INSTALLED_APPS' in locals():
+    from django.conf.global_settings import *
+
+for f in conffiles:
+    exec(open(abspath(f)).read())

=== added file 'playbooks/roles/django-settings-injection/templates/debug.py.j2'
--- playbooks/roles/django-settings-injection/templates/debug.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/debug.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,5 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+DEBUG = {{django_debug}}

=== added file 'playbooks/roles/django-settings-injection/templates/extra-conf.py.j2'
--- playbooks/roles/django-settings-injection/templates/extra-conf.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/extra-conf.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,7 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+{% for p in django_extra_settings.split(',') %}
+{{p}}
+{% endfor %}

=== added file 'playbooks/roles/django-settings-injection/templates/mongodb_engine.py.j2'
--- playbooks/roles/django-settings-injection/templates/mongodb_engine.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/mongodb_engine.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,8 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+MONGO_DB = {
+    'host': '{{ current_relation.host }}',
+    'port': {{ current_relation.port }},
+}

=== added file 'playbooks/roles/django-settings-injection/templates/mysql_engine.py.j2'
--- playbooks/roles/django-settings-injection/templates/mysql_engine.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/mysql_engine.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,18 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+DATABASES = {
+    "default": {
+        "ENGINE": '',
+        "NAME": '{{ current_relation.database }}',
+        "USER": '{{ current_relation.user }}',
+        "PASSWORD": '{{ current_relation.password }}',
+        "HOST": '{{ current_relation.host }}',
+        "PORT": '',
+    }
+}
+
+# Backward compatibility
+DATABASE_ENGINE=DATABASES
+

=== added file 'playbooks/roles/django-settings-injection/templates/pgsql_engine.py.j2'
--- playbooks/roles/django-settings-injection/templates/pgsql_engine.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/pgsql_engine.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,19 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+DATABASES = {
+    "default": {
+        "ENGINE": 'django.db.backends.postgresql_psycopg2',
+        "NAME": '{{ current_relation.database }}',
+        "USER": '{{ current_relation.user }}',
+        "PASSWORD": '{{ current_relation.password }}',
+        "HOST": '{{ current_relation.host }}',
+        "PORT": '',
+        "OPTIONS": {'autocommit': True},
+    }
+}
+
+# Backward compatibility
+DATABASE_ENGINE=DATABASES
+

=== added file 'playbooks/roles/django-settings-injection/templates/redis_engine.py.j2'
--- playbooks/roles/django-settings-injection/templates/redis_engine.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/redis_engine.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,9 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+REDIS = {
+    'host': '{{ current_relation.hostname }}',
+    'port': {{ current_relation.port }},
+    'db': 0,
+}

=== added file 'playbooks/roles/django-settings-injection/templates/secret.py.j2'
--- playbooks/roles/django-settings-injection/templates/secret.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/secret.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,5 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+SECRET_KEY = '{{ site_secret_key }}'

=== added file 'playbooks/roles/django-settings-injection/templates/urls_injection.py.j2'
--- playbooks/roles/django-settings-injection/templates/urls_injection.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/urls_injection.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,18 @@
+#-------------------------------------------------------------------------
+# The following is the import code for the urls directory injected by Juju
+# Do not remove this comment
+#-------------------------------------------------------------------------
+
+import glob
+from os.path import abspath, dirname, join
+
+PROJECT_DIR = abspath(dirname(__file__))
+
+conffiles = glob.glob(join(PROJECT_DIR, '{{ urls_dir_name }}', '*.py'))
+conffiles.sort()
+
+if not 'urlpatterns' in locals():
+    urlpatterns = ()
+
+for f in conffiles:
+    exec(open(abspath(f)).read())

=== added file 'playbooks/roles/django-settings-injection/templates/wsgi.py.j2'
--- playbooks/roles/django-settings-injection/templates/wsgi.py.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/templates/wsgi.py.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,12 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+import os
+import sys
+
+os.environ['DJANGO_SETTINGS_MODULE'] = '{{ settings_module }}'
+
+import django.core.handlers.wsgi
+application = django.core.handlers.wsgi.WSGIHandler()
+

=== added directory 'playbooks/roles/django-settings-injection/vars'
=== added file 'playbooks/roles/django-settings-injection/vars/main.yml'
--- playbooks/roles/django-settings-injection/vars/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/django-settings-injection/vars/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,2 @@
+settings_py_path: "{{ working_dir }}/{{ settings_injection_path }}"
+urls_py_path: "{{ working_dir }}/{{ urls_injection_path }}"

=== added directory 'playbooks/roles/nrpe-external-master'
=== added directory 'playbooks/roles/nrpe-external-master/defaults'
=== added file 'playbooks/roles/nrpe-external-master/defaults/main.yml'
--- playbooks/roles/nrpe-external-master/defaults/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/nrpe-external-master/defaults/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,5 @@
+---
+service_context: juju
+unit_name: "{{ local_unit | replace('/', '-') }}"
+plugin_dir: /usr/lib/nagios/plugins
+service_description:

=== added directory 'playbooks/roles/nrpe-external-master/tasks'
=== added file 'playbooks/roles/nrpe-external-master/tasks/main.yml'
--- playbooks/roles/nrpe-external-master/tasks/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/nrpe-external-master/tasks/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,25 @@
+- name: Write nagios check command config.
+  tags:
+    - nrpe-external-master-relation-changed
+  template:
+    src: "check_name.cfg.jinja2"
+    dest: "/etc/nagios/nrpe.d/{{ check_name }}.cfg"
+    owner: nagios
+    group: nagios
+    mode: 0644
+
+- name: Write nagios check service definition for export.
+  tags:
+    - nrpe-external-master-relation-changed
+  template:
+    src: "check_name_service_export.cfg.jinja2"
+    dest: "/var/lib/nagios/export/service__{{ service_context }}-{{ unit_name }}_{{ check_name }}.cfg"
+    owner: nagios
+    group: nagios
+    mode: 0644
+
+- name: Trigger nrpe-external-master-relation-changed to restart.
+  tags:
+    - nrpe-external-master-relation-changed
+  command: >
+    relation-set timestamp={{ ansible_date_time.iso8601_micro }}

=== added directory 'playbooks/roles/nrpe-external-master/templates'
=== added file 'playbooks/roles/nrpe-external-master/templates/check_name.cfg.jinja2'
--- playbooks/roles/nrpe-external-master/templates/check_name.cfg.jinja2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/nrpe-external-master/templates/check_name.cfg.jinja2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,4 @@
+#---------------------------------------------------
+# This file is Juju managed
+#---------------------------------------------------
+command[{{ check_name }}]={{ plugin_dir }}/{{ check_name }} {{ check_params }}

=== added file 'playbooks/roles/nrpe-external-master/templates/check_name_service_export.cfg.jinja2'
--- playbooks/roles/nrpe-external-master/templates/check_name_service_export.cfg.jinja2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/nrpe-external-master/templates/check_name_service_export.cfg.jinja2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,10 @@
+#---------------------------------------------------
+# This file is Juju managed
+#---------------------------------------------------
+define service {
+    use                             active-service
+    host_name                       {{ service_context }}-{{ unit_name }}
+    service_description             {{ service_description }}
+    check_command                   check_nrpe!{{ check_name }}
+    servicegroups                   {{ service_context }}
+}

=== added directory 'playbooks/roles/pip'
=== added directory 'playbooks/roles/pip/defaults'
=== added file 'playbooks/roles/pip/defaults/main.yml'
--- playbooks/roles/pip/defaults/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/pip/defaults/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,14 @@
+# Comma separated extra packages to install.
+additional_pip_packages: ""
+
+# Comma separated relative paths or urls to a requirement files. Note that the charm
+# won't manually upgrade packages defined in this file.
+# Leave the variable to an empty string if you don't want the feature.
+requirements_pip_files: ""
+
+# Where to search for requirements files
+requirements_pip_dir: ""
+
+# Extra arguments passed to pip.
+pip_extra_args: ""
+

=== added directory 'playbooks/roles/pip/tasks'
=== added file 'playbooks/roles/pip/tasks/main.yml'
--- playbooks/roles/pip/tasks/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/pip/tasks/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,28 @@
+- name: Install roles dependencies
+  apt: pkg="{{ item }}" state=latest update_cache=yes
+  with_items:
+      - python-pip
+      - mercurial
+      - git-core
+      - subversion
+      - bzr
+  register: result
+  until: result|success
+  retries: 24
+  delay: 10
+
+- name: Install pip dependencies
+  pip: name="{{ item }}" extra_args="{{ pip_extra_args }}"
+  with_items: additional_pip_packages.split(',')
+  when: additional_pip_packages != ''
+
+- name: Install pip requirements
+  pip: requirements="{{ requirements_pip_dir }}/{{ item }}" extra_args="{{ pip_extra_args }}"
+  with_lines: echo "{{ requirements_pip_files }}" | tr "," "\n" | awk "! /^http/"
+  when: requirements_pip_files != ''
+
+- name: Install http pip requirements
+  pip: requirements="{{ item }}" extra_args="{{ pip_extra_args }}"
+  with_lines: echo "{{ requirements_pip_files }}" | tr "," "\n" | awk "/^http/"
+  when: requirements_pip_files != ''
+

=== added directory 'playbooks/roles/unit-config'
=== added directory 'playbooks/roles/unit-config/tasks'
=== added file 'playbooks/roles/unit-config/tasks/main.yml'
--- playbooks/roles/unit-config/tasks/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/unit-config/tasks/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,4 @@
+# unit_config
+- name: Create unit_config file
+  shell: cat "{{ unit_config | b64decode }}" > {{ unit_config_path }}
+  when: unit_config != ''

=== added directory 'playbooks/roles/upstart'
=== added directory 'playbooks/roles/upstart/default'
=== added file 'playbooks/roles/upstart/default/main.yml'
--- playbooks/roles/upstart/default/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/upstart/default/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,1 @@
+name: ""

=== added directory 'playbooks/roles/upstart/tasks'
=== added file 'playbooks/roles/upstart/tasks/main.yml'
--- playbooks/roles/upstart/tasks/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/upstart/tasks/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,13 @@
+- name: Install upstart template
+  template:
+    src: "upstart.conf.j2"
+    dest: "/etc/init/{{ name }}.conf"
+    owner: "root"
+    group: "root"
+    mode: "640"
+  when: name is defined
+
+- name: Restart the service
+  command: service restart "{{ name }}"
+  when: name is defined
+

=== added directory 'playbooks/roles/upstart/templates'
=== added file 'playbooks/roles/upstart/templates/upstart.conf.j2'
--- playbooks/roles/upstart/templates/upstart.conf.j2	1970-01-01 00:00:00 +0000
+++ playbooks/roles/upstart/templates/upstart.conf.j2	2014-07-07 20:28:28 +0000
@@ -0,0 +1,47 @@
+#--------------------------------------------------------------
+# This file is managed by Juju; ANY CHANGES WILL BE OVERWRITTEN
+#--------------------------------------------------------------
+
+#FIXME
+
+description "Gunicorn daemon for the {{ project_name }} project"
+
+start on (local-filesystems and net-device-up IFACE=eth0)
+stop on runlevel [!12345]
+
+# If the process quits unexpectadly trigger a respawn
+respawn
+respawn limit 10 5
+
+setuid {{ wsgi_user }}
+setgid {{ wsgi_group }}
+chdir {{ working_dir }}
+
+# This line can be removed and replace with the --pythonpath {{ python_path }} \
+# option with Gunicorn>1.17
+env PYTHONPATH={{ python_path }}
+{% for name, value in env_extra -%}
+env {{ name }}="{{ value }}"
+{% endfor %}
+
+exec gunicorn \
+    --name={{ project_name }} \
+    --workers={{ wsgi_workers }} \
+    --worker-class={{ wsgi_worker_class }} \
+    --worker-connections={{ wsgi_worker_connections }} \
+    --max-requests={{ wsgi_max_requests }} \
+    --backlog={{ wsgi_backlog }} \
+    --timeout={{ wsgi_timeout }} \
+    --keep-alive={{ wsgi_keep_alive }} \
+    --umask={{ wsgi_umask }} \
+    --bind={{ listen_ip }}:{{ port }} \
+    --log-file={{ wsgi_log_file }} \
+    --log-level={{ wsgi_log_level }} \
+    {%- if wsgi_access_logfile %}
+    --access-logfile={{ wsgi_access_logfile }} \
+    {%- endif %}
+    {%- if wsgi_access_logformat %}
+    --access-logformat={{ wsgi_access_logformat }} \
+    {%- endif %}
+    {{ wsgi_extra }} \
+    {{ wsgi_wsgi_file }}

=== added directory 'playbooks/roles/vcs'
=== added directory 'playbooks/roles/vcs/defaults'
=== added file 'playbooks/roles/vcs/defaults/main.yml'
--- playbooks/roles/vcs/defaults/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/vcs/defaults/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,22 @@
+# The vcs software to use. Only hg, git, bzr, and svn are currently supported.
+vcs: ""
+
+# The vcs url to checkout.
+repos_url: ""
+
+# The repo branch to pull out from. If empty, it will pull out the
+# default branch or trunk (such as origin/master with git).
+# Can also be a changeset, revision number or even tag depending
+# on the chosen vcs.
+repos_branch: ""
+
+# The vcs user name.
+# Note: *Subversion only* settings. For other vcs use the repos_url for auth.
+repos_username: ""
+
+# The vcs password.
+# Note: *Subversion only* settings. For other vcs use the repos_url for auth.
+repos_password: ""
+
+# The destination directory of the checkout.
+vcs_clone_dir: ""

=== added directory 'playbooks/roles/vcs/tasks'
=== added file 'playbooks/roles/vcs/tasks/main.yml'
--- playbooks/roles/vcs/tasks/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/vcs/tasks/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,44 @@
+- name: Install roles dependencies
+  apt: pkg="{{ item }}" state=latest update_cache=yes
+  with_items:
+      - mercurial
+      - git-core
+      - subversion
+      - bzr
+  register: result
+  until: result|success
+  retries: 24
+  delay: 10
+
+- name: get mercurial source
+  hg: repo={{ repos_url }} dest={{ vcs_clone_dir }}
+  when: vcs == 'hg' or vcs == 'mercurial' and not repos_branch
+
+- name: get bzr source
+  bzr: name={{ repos_url }} dest={{ vcs_clone_dir }}
+  when: vcs == 'bzr' and not repos_branch
+
+- name: get git source
+  git: repo={{ repos_url }} dest={{ vcs_clone_dir }}
+  when: vcs == 'git' and not repos_branch
+
+- name: get subversion source
+  subversion: repo={{ repos_url }} dest={{ vcs_clone_dir }} username={{ repos_username }} password={{ repos_password }}
+  when: vcs == 'svn' or vcs == 'subversion' and not repos_branch
+
+#VCS + Branch
+- name: get mercurial source with branch
+  hg: repo={{ repos_url }} dest={{ vcs_clone_dir }} revision={{ repos_branch }}
+  when: vcs == 'hg' or vcs == 'mercurial' and repos_branch
+
+- name: get bzr source
+  bzr: name={{ repos_url }} dest={{ vcs_clone_dir }} version={{ repos_branch }}
+  when: vcs == 'bzr' and repos_branch
+
+- name: get git source with branch
+  git: repo={{ repos_url }} dest={{ vcs_clone_dir }} version={{ repos_branch }}
+  when: vcs == 'git' and repos_branch
+
+- name: get subversion source
+  subversion: repo={{ repos_url }} dest={{ vcs_clone_dir }} username={{ repos_username }} password={{ repos_password }} revision={{ repos_branch }}
+  when: vcs == 'svn' or vcs == 'subversion' and repos_branch

=== added directory 'playbooks/roles/wsgi-app'
=== added file 'playbooks/roles/wsgi-app/README'
--- playbooks/roles/wsgi-app/README	1970-01-01 00:00:00 +0000
+++ playbooks/roles/wsgi-app/README	2014-07-07 20:28:28 +0000
@@ -0,0 +1,29 @@
+The wsgi-app charm role
+=======================
+
+This ansible role can be included in your charm, enabling you to re-use
+existing tested charm functionality to deploy your wsgi application.
+
+To see an example of how this role can be used for a charm, see XXX.
+
+The role assumes that your charm defines the following items (as either
+charm config options, or as variables in your playbook):
+
+Required:
+ * app_label - A label to identify your app - a domain will be fine.
+ * code_archive - the relative name of your application code archive,
+   eg. "r25/my-app.bzip2", or "beta-test/my-app.bzip2".
+ * wsgi_application - the location of your wsgi application relative to
+   your code. This is passed to the wsgi provider. For example:
+   "myproject.wsgi:application".
+
+Optional:
+ * code_asset_uri - an optional uri from which the code_archive will be
+   sourced. Without this, it'll look for code_archive in the ${CHARM}/files
+   directory.
+ * current_symlink - an optional label that can be used for rolling upgrades.
+   By default this always points to the last installed code_archive. But you
+   can explicitly request a previously installed version of your code to be
+   used instead.
+ * listen_port - the port on which the wsgi provider should serve your app.
+ * env_extra - extra environment variables to pass to the wsgi-file provider.

=== added directory 'playbooks/roles/wsgi-app/defaults'
=== added file 'playbooks/roles/wsgi-app/defaults/main.yml'
--- playbooks/roles/wsgi-app/defaults/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/wsgi-app/defaults/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,7 @@
+code_assets_uri: ''
+python_path: ''
+current_symlink: latest
+listen_port: 8080
+env_extra: ''
+wsgi_user: wsgi_user
+wsgi_group: wsgi_group

=== added directory 'playbooks/roles/wsgi-app/handlers'
=== added file 'playbooks/roles/wsgi-app/handlers/main.yml'
--- playbooks/roles/wsgi-app/handlers/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/wsgi-app/handlers/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,7 @@
+- name: Restart wsgi
+  # Trigger the wsgi subordinate to restart by changing settings.
+  command: >
+    relation-set -r {{ item.key }}
+    timestamp={{ ansible_date_time.iso8601_micro }}
+  when: relations['wsgi-file']
+  with_dict: relations['wsgi-file']

=== added directory 'playbooks/roles/wsgi-app/tasks'
=== added file 'playbooks/roles/wsgi-app/tasks/main.yml'
--- playbooks/roles/wsgi-app/tasks/main.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/wsgi-app/tasks/main.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,78 @@
+---
+#- include: setup-machine.yml
+#- include: setup-code.yml
+
+#- name: Symlink latest tarball of application code
+#  tags:
+#    - config-changed
+#  file:
+#    src: "{{ code_dir }}/{{ code_archive | dirname }}"
+#    dest: "{{ code_dir }}/latest"
+#    owner: "{{ wsgi_user }}"
+#    group: "{{ wsgi_group }}"
+#    state: link
+#
+#- name: Check whether the set current symlink exists.
+#  tags:
+#    - wsgi-file-relation-changed
+#    - config-changed
+#  stat: path={{ code_dir }}/{{ current_symlink }}
+#  register: stat_current_symlink
+#- name: Fail if the configured current_symlink does not exist.
+#  tags:
+#    - wsgi-file-relation-changed
+#    - config-changed
+#  fail: msg="The configured current_symlink does not exist, {{ code_dir }}/{{ current_symlink }}"
+#  when: stat_current_symlink.stat.exists == False
+#
+#- name: Update the current symlink.
+#  tags:
+#    - wsgi-file-relation-changed
+#    - config-changed
+#  file:
+#    src: "{{ code_dir }}/{{ current_symlink }}"
+#    dest: "{{ code_dir }}/current"
+#    owner: "{{ wsgi_user }}"
+#    group: "{{ wsgi_group }}"
+#    state: link
+
+- name: Set wsgi details if relation defined
+  command: >
+    relation-set -r {{ item.key }}
+    project_name={{ app_label }}
+    working_dir={{ working_dir }}
+    python_path={{ python_path }}
+    wsgi_user={{ wsgi_user }}
+    wsgi_group={{ wsgi_group }}
+    port={{ listen_port }}
+    wsgi_wsgi_file={{ wsgi_application }}
+    env_extra='{{ env_extra }}'
+    timestamp={{ ansible_date_time.iso8601_micro }}
+  when: relations['wsgi']
+  with_dict: relations['wsgi']
+
+#    wsgi_access_logfile={{ log_dir }}/{{ app_label }}-access.log
+#    wsgi_extra=--error-logfile={{ log_dir }}/{{ app_label }}-error.log
+
+#- name: Set the website relation if defined.
+#  tags:
+#    - website-relation-changed
+#    - config-changed
+#  command: >
+#    relation-set -r {{ item.key }}
+#    hostname={{ ansible_default_ipv4.address }}
+#    port={{ listen_port }}
+#  when: relations['website']
+#  with_dict: relations['website']
+#
+#- name: Manually set current symlink.
+#  tags:
+#    - set-current-symlink
+#  file:
+#    src: "{{ code_dir }}/{{ ansible_env.CURRENT_SYMLINK }}"
+#    dest: "{{ code_dir }}/current"
+#    owner: "{{ wsgi_user }}"
+#    group: "{{ wsgi_group }}"
+#    state: link
+#  notify:
+#    - Restart wsgi

=== added file 'playbooks/roles/wsgi-app/tasks/setup-code.yml'
--- playbooks/roles/wsgi-app/tasks/setup-code.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/wsgi-app/tasks/setup-code.yml	2014-07-07 20:28:28 +0000
@@ -0,0 +1,54 @@
+---
+- name: Copy code_archive from the charm if not using code_assets_uri
+  tags:
+    - config-changed
+  copy:
+    src: "{{ charm_dir }}/files/{{ code_archive }}"
+    dest: "{{ archives_dir }}/{{ code_archive }}"
+    force: no
+    owner: "{{ wsgi_user }}"
+    group: "{{ wsgi_group }}"
+    mode: 0644
+  when: code_assets_uri == ""
+
+- name: Download code tarball archive from the code assets uri
+  tags:
+    - config-changed
+  get_url:
+    url: "{{ code_assets_uri }}/{{ code_archive }}"
+    dest: "{{ archives_dir }}/{{ code_archive }}"
+    force: no
+    owner: "{{ wsgi_user }}"
+    group: "{{ wsgi_group }}"
+    mode: 0644
+  when: code_assets_uri != ""
+
+- name: Check if archive is already extracted
+  tags:
+    - config-changed
+  stat: path={{ current_code_dir }}/EXTRACTED
+  register: already_extracted
+
+- name: Extract built app sourcecode.
+  tags:
+    - config-changed
+  unarchive:
+    src: "{{ archives_dir }}/{{ code_archive }}"
+    dest: "{{ current_code_dir }}"
+    owner: "{{ wsgi_user }}"
+    group: "{{ wsgi_group }}"
+  when: already_extracted.stat.exists == False
+
+# The following is only necessary because the unarchived code files
+# won't have the correct user/group.
+- name: Set user/group for application directory.
+  tags:
+    - config-changed
+  file: path={{ code_dir }} state=directory owner={{ wsgi_user }} group={{ wsgi_group }} recurse=yes
+  when: already_extracted.stat.exists == False
+
+- name: Touch a file to ensure that we don't extract the same archive again.
+  command: /usr/bin/touch {{ current_code_dir }}/EXTRACTED
+  tags:
+    - config-changed
+  when: already_extracted.stat.exists == False

=== added file 'playbooks/roles/wsgi-app/tasks/setup-machine.yml'
--- playbooks/roles/wsgi-app/tasks/setup-machine.yml	1970-01-01 00:00:00 +0000
+++ playbooks/roles/wsgi-app/tasks/setup-machine.yml	2014-07-07 20:28:28 +0000