Merge lp:~niedbalski/charms/precise/rsyslog/lp-1310793 into lp:charms/rsyslog

[Jorge Niedbalski]

Proposed for fix lp:1310793

[Tim Van Steenburgh (tvansteenburgh)]

Hey Jorge,

Thanks for this submission, it looks great! Happy to see all those unit tests! I had to make a small change to the test_hooks.py file to get `make test` to complete successfully, so that should probably be updated on your branch:

--- unit_tests/test_hooks.py 2014-04-30 20:29:29.665068579 -0400
+++ unit_tests/test_hooks.py.new 2014-04-30 20:28:02.954158683 -0400
@@ -13,7 +13,7 @@
 except ImportError as ex:
     raise ImportError("Please install unittest and mock modules")

-from hooks import hooks
+import hooks

 TO_PATCH = [
     "apt_install",

Aside from that, this looks awesome and gets a big +1 from me. Someone from the charmers team will come through soon to do a followup review and promulgate these changes into the charm store.

If you have any questions/comments/concerns about the review contact us in #juju on irc.freenode.net or email the mailing list <email address hidden>

Thanks again for this contribution!

[Marco Ceppi (marcoceppi)]

Hi Jorge,

In addition to the one line fix that Tim mentioned, make lint is also failing with a few flake8 errors:

$ make lint
hooks/hooks.py:5:1: F401 're' imported but unused
hooks/hooks.py:54:9: F401 'jinja2' imported but unused
make: *** [lint] Error 1

Could you address those as well prior to merging, otherwise another +1 from me, amazing work!

[lp:~niedbalski/charms/precise/rsyslog/lp-1310793]

12. By Jorge Niedbalski on 2014-05-01

[review] modified according to Tim Van Steenburgh , and Marco Ceppi observations

[Jorge Niedbalski (niedbalski)]

Hey guys,

Fixed.

[flake8 --exclude=charmhelpers --count] == 0
[make test] == 7 passed, 0 failed

Thanks!

[lp:~niedbalski/charms/precise/rsyslog/lp-1310793]

13. By Jorge Niedbalski on 2014-05-01

[fix] Modload imtcp not exposed yet

[Marco Ceppi (marcoceppi)]

LGTM, THANKS!

review: Approve

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2014-05-01 19:18:03 +0000
@@ -0,0 +1,22 @@
+#!/usr/bin/make
+PYTHON := /usr/bin/env python
+
+build: sync-charm-helpers lint
+
+lint:
+	@flake8 --exclude hooks/charmhelpers --ignore=E125 hooks
+
+test:
+	@pip install -r test_requirements.txt
+	@PYTHONPATH=$(PYTHON_PATH):hooks/ nosetests --nologcapture unit_tests 
+
+bin/charm_helpers_sync.py:
+	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py > bin/charm_helpers_sync.py
+
+sync-charm-helpers: bin/charm_helpers_sync.py
+	@$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers.yaml
+
+deploy:
+	@echo Deploying charm-rsyslog template.
+	@juju deploy --repository=../.. local:rsyslog
+	@echo See the README for explorations after deploying.

=== modified file 'README'
--- README	2012-09-11 15:59:06 +0000
+++ README	2014-05-01 19:18:03 +0000
@@ -5,5 +5,4 @@
 TODO:
 -----
 -Tighter security
--Configurable filters
 -Forwarding

=== added file 'charm-helpers.yaml'
--- charm-helpers.yaml	1970-01-01 00:00:00 +0000
+++ charm-helpers.yaml	2014-05-01 19:18:03 +0000
@@ -0,0 +1,5 @@
+branch: lp:charm-helpers
+destination: hooks/charmhelpers
+include:
+  - core
+  - fetch

=== modified file 'config.yaml'
--- config.yaml	2014-03-14 16:33:25 +0000
+++ config.yaml	2014-05-01 19:18:03 +0000
@@ -7,3 +7,7 @@
     type: int
     default: 4
     description: "Number of days to rotate /var/log/messages and other associated files"
+  nova_logs:
+    type: boolean
+    default: false
+    description: "Have an individual log file for each compute node as well as an aggregated log that contains nova logs from all nodes"

=== removed directory 'files'
=== removed file 'files/60-aggregator.conf'
--- files/60-aggregator.conf	2012-04-17 09:35:17 +0000
+++ files/60-aggregator.conf	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-# Remote listening for aggregation
-$ModLoad imudp
-$UDPServerRun 514
-
-$ModLoad imtcp
-$InputTCPMaxSessions 500
-$InputTCPServerRun 10514

=== 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/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-05-01 19:18:03 +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))

=== added directory 'hooks/charmhelpers/core'
=== added file 'hooks/charmhelpers/core/__init__.py'
=== 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-05-01 19:18:03 +0000
@@ -0,0 +1,401 @@
+"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])
+
+
+@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:
+        return json.loads(subprocess.check_output(config_cmd_line))
+    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-05-01 19:18:03 +0000
@@ -0,0 +1,297 @@
+"""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
+
+from collections import OrderedDict
+
+from hookenv import log
+
+
+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 mount(device, mountpoint, options=None, persist=False):
+    """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:
+        # TODO: update fstab
+        pass
+    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:
+        # TODO: update fstab
+        pass
+    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

=== 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-05-01 19:18:03 +0000
@@ -0,0 +1,308 @@
+import importlib
+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',
+}
+
+
+def filter_installed_packages(packages):
+    """Returns a list of packages that require installation"""
+    apt_pkg.init()
+    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))
+    env = os.environ.copy()
+    if 'DEBIAN_FRONTEND' not in env:
+        env['DEBIAN_FRONTEND'] = 'noninteractive'
+
+    if fatal:
+        subprocess.check_call(cmd, env=env)
+    else:
+        subprocess.call(cmd, env=env)
+
+
+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))
+
+    env = os.environ.copy()
+    if 'DEBIAN_FRONTEND' not in env:
+        env['DEBIAN_FRONTEND'] = 'noninteractive'
+
+    if fatal:
+        subprocess.check_call(cmd, env=env)
+    else:
+        subprocess.call(cmd, env=env)
+
+
+def apt_update(fatal=False):
+    """Update local apt cache"""
+    cmd = ['apt-get', 'update']
+    if fatal:
+        subprocess.check_call(cmd)
+    else:
+        subprocess.call(cmd)
+
+
+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))
+    if fatal:
+        subprocess.check_call(cmd)
+    else:
+        subprocess.call(cmd)
+
+
+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',
+                               'keyserver.ubuntu.com', '--recv',
+                               key])
+
+
+class SourceConfigError(Exception):
+    pass
+
+
+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)
+
+# 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',
+)
+
+
+class UnhandledSource(Exception):
+    pass
+
+
+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)
+
+
+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 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

=== 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-05-01 19:18:03 +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-05-01 19:18:03 +0000
@@ -0,0 +1,49 @@
+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

=== added symlink 'hooks/config-changed'
=== target is u'hooks.py'
=== removed file 'hooks/config-changed'
--- hooks/config-changed	2014-03-17 10:34:02 +0000
+++ hooks/config-changed	1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-#!/usr/bin/env python
-
-import re
-import subprocess
-import json
-
-
-def juju_log(message=None):
-    return (subprocess.call(['juju-log', str(message)]) == 0)
-
-log_rotate_conf = '/etc/logrotate.d/rsyslog'
-
-config_cmd_line = ['config-get', '--format=json']
-
-syslog_rotate_interval = str(json.loads(subprocess.check_output(
-    config_cmd_line + ['syslog_rotate'])))
-messages_rotate_interval = str(json.loads(subprocess.check_output(
-    config_cmd_line + ['messages_rotate'])))
-
-with open(log_rotate_conf, mode='r') as config_file:
-    config = config_file.readlines()
-    config_file.close()
-
-    param_index = config.index('/var/log/syslog\n')
-    replace_pattern = syslog_rotate_interval + '\n'
-    config[param_index+2] = re.sub(r'\d*\n$',
-                                   replace_pattern, config[param_index+2])
-    juju_log("syslog_rotate_interval set to %s" % syslog_rotate_interval)
-
-    param_index = config.index('/var/log/messages\n')
-    replace_pattern = messages_rotate_interval + '\n'
-    config[param_index+2] = re.sub(r'\d*\n$',
-                                   replace_pattern, config[param_index+2])
-    juju_log("messages_rotate_interval set to %s" % messages_rotate_interval)
-
-with open(log_rotate_conf, mode='w') as config_file:
-    for line in config:
-        config_file.write(line)
-    config_file.close

=== added file 'hooks/hooks.py'
--- hooks/hooks.py	1970-01-01 00:00:00 +0000
+++ hooks/hooks.py	2014-05-01 19:18:03 +0000
@@ -0,0 +1,125 @@
+#!/usr/bin/env python
+
+import os
+import sys
+
+_HERE = os.path.abspath(os.path.dirname(__file__))
+
+sys.path.insert(0, os.path.join(_HERE, 'charmhelpers'))
+
+from charmhelpers.core.host import (
+    service_start,
+    service_stop,
+    service_restart,
+)
+
+from charmhelpers.core.hookenv import (
+    Hooks,
+    close_port,
+    open_port,
+    config as config_get,
+    log as juju_log,
+    charm_dir,
+)
+
+from charmhelpers.fetch import (
+    apt_install
+)
+
+DEFAULT_RSYSLOG_PORT = 514
+DEFAULT_RSYSLOG_PATH = os.path.join(os.path.sep, 'etc', 'rsyslog.d')
+DEFAULT_LOGROTATE_PATH = os.path.join(os.path.sep, 'etc', 'logrotate.d',
+                                      'rsyslog')
+DEFAULT_CONFIGURATION_PARAMS = (
+    'syslog_rotate',
+    'messages_rotate',
+    'nova_logs'
+)
+
+required_debian_pkgs = [
+    'rsyslog',
+    'python-jinja2',
+]
+
+hooks = Hooks()
+
+try:
+    from jinja2 import Environment, FileSystemLoader
+except ImportError:
+    apt_install(['python-jinja2'], options=['-f'])
+    from jinja2 import Environment, FileSystemLoader
+
+
+def get_template_dir():
+    return os.path.join(charm_dir(), 'templates')
+
+
+def get_config_template(name):
+    template_env = Environment(loader=FileSystemLoader(get_template_dir()))
+    return template_env.get_template(name)
+
+
+def get_changed_config():
+    changed = {}
+    for config_key in DEFAULT_CONFIGURATION_PARAMS:
+        changed[config_key] = config_get(config_key)
+        juju_log("Configuration key:%s set to value: %s" %
+                 (config_key, changed[config_key]))
+    return changed
+
+
[e-mail]()
+def install():
+    apt_install(required_debian_pkgs, options=['-f'])
+
+
[e-mail]("upgrade-charm")
+def upgrade_charm():
+    install()
+
+
[e-mail]("start")
+def start():
+    service_start("rsyslog")
+    open_port(DEFAULT_RSYSLOG_PORT)
+    open_port(DEFAULT_RSYSLOG_PORT, protocol="UDP")
+
+
[e-mail]("stop")
+def stop():
+    service_stop("rsyslog")
+    close_port(DEFAULT_RSYSLOG_PORT)
+    close_port(DEFAULT_RSYSLOG_PORT, protocol="UDP")
+
+
+def update_logrotate_config(**params):
+    template_name = "rsyslog.conf"
+    template = get_config_template(template_name)
+
+    with open(DEFAULT_LOGROTATE_PATH, 'w') as logrotate_config:
+        logrotate_config.write(template.render(**params))
+
+
+def update_rsyslog_config(**params):
+    template_name = "60-aggregator.conf"
+    template = get_config_template(template_name)
+
+    with open(os.path.join(DEFAULT_RSYSLOG_PATH,
+                           template_name), 'w') as rsyslog_config:
+        rsyslog_config.write(template.render(**params))
+
+
[e-mail]("config-changed")
+def config_changed():
+    config = get_changed_config()
+
+    update_logrotate_config(**config)
+    update_rsyslog_config(**config)
+
+    juju_log("Configuration changed, restart required")
+
+    #configuration changed, restart rsyslog
+    service_restart("rsyslog")
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== added symlink 'hooks/install'
=== target is u'hooks.py'
=== removed file 'hooks/install'
--- hooks/install	2012-04-17 09:35:17 +0000
+++ hooks/install	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -ue
-
-apt-get install -y rsyslog
-
-install -m 0644 -o root -g root files/60-aggregator.conf /etc/rsyslog.d/60-aggregator.conf
-service rsyslog restart

=== added symlink 'hooks/start'
=== target is u'hooks.py'
=== removed file 'hooks/start'
--- hooks/start	2012-04-17 08:06:34 +0000
+++ hooks/start	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-set -ue
-
-service rsyslog start || :
-
-open-port 514/tcp
-open-port 514/udp

=== added symlink 'hooks/stop'
=== target is u'hooks.py'
=== removed file 'hooks/stop'
--- hooks/stop	2012-09-11 15:59:53 +0000
+++ hooks/stop	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-#!/bin/bash
-service rsyslog stop
-close-port 514/tcp
-close-port 514/udp

=== added symlink 'hooks/upgrade-charm'
=== target is u'hooks.py'
=== removed file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2012-04-17 09:35:17 +0000
+++ hooks/upgrade-charm	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-#!/bin/sh
-hooks/install

=== modified file 'revision'
--- revision	2012-04-17 09:35:17 +0000
+++ revision	2014-05-01 19:18:03 +0000
@@ -1,1 +1,1 @@
-9
+14

=== added file 'setup.cfg'
--- setup.cfg	1970-01-01 00:00:00 +0000
+++ setup.cfg	2014-05-01 19:18:03 +0000
@@ -0,0 +1,5 @@
+[nosetests]
+verbosity=2
+with-coverage=1
+cover-erase=1
+cover-package=hooks.hooks

=== added directory 'templates'
=== added file 'templates/60-aggregator.conf'
--- templates/60-aggregator.conf	1970-01-01 00:00:00 +0000
+++ templates/60-aggregator.conf	2014-05-01 19:18:03 +0000
@@ -0,0 +1,7 @@
+# Remote listening for aggregation
+$ModLoad imudp
+$UDPServerRun 514
+
+{% if nova_logs == True %}
+   {% include 'nova-logging.conf' %}
+{% endif %}

=== added file 'templates/nova-logging.conf'
--- templates/nova-logging.conf	1970-01-01 00:00:00 +0000
+++ templates/nova-logging.conf	2014-05-01 19:18:03 +0000
@@ -0,0 +1,12 @@
+# Create logging templates for nova
+$template NovaFile,"/var/log/rsyslog/%HOSTNAME%/nova.log"
+$template NovaAll,"/var/log/rsyslog/nova.log"
+
+# Log everything else to syslog.log
+$template DynFile,"/var/log/rsyslog/%HOSTNAME%/syslog.log"
+*.* ?DynFile
+
+# Log various openstack components to their own individual file
+local0.* ?NovaFile
+local0.* ?NovaAll
+& ~

=== added file 'templates/rsyslog.conf'
--- templates/rsyslog.conf	1970-01-01 00:00:00 +0000
+++ templates/rsyslog.conf	2014-05-01 19:18:03 +0000
@@ -0,0 +1,37 @@
+/var/log/syslog
+{
+	rotate {{syslog_rotate}}
+	daily
+	missingok
+	notifempty
+	delaycompress
+	compress
+	postrotate
+		reload rsyslog >/dev/null 2>&1 || true
+	endscript
+}
+
+/var/log/mail.info
+/var/log/mail.warn
+/var/log/mail.err
+/var/log/mail.log
+/var/log/daemon.log
+/var/log/kern.log
+/var/log/auth.log
+/var/log/user.log
+/var/log/lpr.log
+/var/log/cron.log
+/var/log/debug
+/var/log/messages
+{
+	rotate {{messages_rotate}}
+	weekly
+	missingok
+	notifempty
+	compress
+	delaycompress
+	sharedscripts
+	postrotate
+		reload rsyslog >/dev/null 2>&1 || true
+	endscript
+}

=== added file 'test_requirements.txt'
--- test_requirements.txt	1970-01-01 00:00:00 +0000
+++ test_requirements.txt	2014-05-01 19:18:03 +0000
@@ -0,0 +1,6 @@
+Jinja2
+PyYAML
+coverage
+mock==1.0.1
+nose==1.3.1
+https://launchpad.net/python-apt/main/0.7.8/+download/python-apt-0.8.5.tar.gz

=== added directory 'unit_tests'
=== added file 'unit_tests/test_hooks.py'
--- unit_tests/test_hooks.py	1970-01-01 00:00:00 +0000
+++ unit_tests/test_hooks.py	2014-05-01 19:18:03 +0000
@@ -0,0 +1,149 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+__author__ = 'Jorge Niedbalski R. <[e-mail]>'
+
+import os
+
+_HERE = os.path.abspath(os.path.dirname(__file__))
+
+try:
+    import unittest
+    import mock
+except ImportError as ex:
+    raise ImportError("Please install unittest and mock modules")
+
+import hooks
+
+TO_PATCH = [
+    "apt_install",
+    "install",
+    "service_restart",
+    "service_start",
+    "open_port",
+    "service_stop",
+    "close_port",
+    "juju_log",
+    "charm_dir",
+    "config_get"
+]
+
+
+class HooksTestCase(unittest.TestCase):
+
+    def setUp(self):
+        unittest.TestCase.setUp(self)
+        self.patch_all()
+
+        self.juju_log.return_value = True
+        self.apt_install.return_value = True
+        self.charm_dir.return_value = os.path.join(_HERE, '..')
+
+    def patch(self, method):
+        _m = mock.patch.object(hooks, method)
+        _mock = _m.start()
+        self.addCleanup(_m.stop)
+        return _mock
+
+    def patch_all(self):
+        for method in TO_PATCH:
+            setattr(self, method, self.patch(method))
+
+    def test_install_hook(self):
+        """Check if install hooks is correctly executed
+        """
+        hooks.hooks.execute(['install'])
+        self.apt_install.assert_called_with(['rsyslog', 'python-jinja2'],
+                                            options=["-f"])
+
+    def test_upgrade_charm(self):
+        """Check if charm upgrade hooks is correctly executed
+        """
+        hooks.hooks.execute(['upgrade-charm'])
+        self.install.assert_called()
+
+    def test_start_charm(self):
+        """Check if start hook is correctly executed
+        """
+        hooks.hooks.execute(['start'])
+        self.service_start.assert_called_with("rsyslog")
+
+        expected = [mock.call(514),
+                    mock.call(514, protocol="UDP")]
+
+        self.assertEquals(self.open_port.call_args_list,
+                          expected)
+
+    def test_stop_charm(self):
+        """Check if start hooks is correctly executed
+        """
+        hooks.hooks.execute(['stop'])
+
+        self.service_stop.assert_called_with("rsyslog")
+
+        expected = [mock.call(514),
+                    mock.call(514, protocol="UDP")]
+
+        self.assertTrue(self.close_port.call_args_list == expected)
+
+    def _tpl_has_value(self, template, value):
+        return hooks.get_config_template(template).render(
+            **hooks.get_changed_config()).find(value) > 0
+
+    def test_config_nova_disabled(self):
+        """Check if configuration templates are created correctly \
+        ( nova_logs: False )
+        """
+        self.apt_install.return_value = True
+        self.charm_dir.return_value = os.path.join(_HERE, '..')
+
+        config = {
+            "syslog_rotate": 7,
+            "messages_rotate": 4,
+            "nova_logs": False
+        }
+
+        def config_side(*args, **kwargs):
+            return config[args[0]]
+
+        self.config_get.side_effect = config_side
+
+        self.assertFalse(self._tpl_has_value("60-aggregator.conf", "nova"))
+        self.assertTrue(self._tpl_has_value("rsyslog.conf", "7"))
+        self.assertTrue(self._tpl_has_value("rsyslog.conf", "4"))
+
+    def test_config_nova_enabled(self):
+        """Check if configuration templates are created correctly \
+        ( nova_logs: True )
+        """
+        config = {
+            "syslog_rotate": 7,
+            "messages_rotate": 4,
+            "nova_logs": True
+        }
+
+        def config_side(*args, **kwargs):
+            return config[args[0]]
+
+        self.config_get.side_effect = config_side
+        self.assertTrue(self._tpl_has_value("60-aggregator.conf", "nova"))
+
+    def test_config_changed(self):
+        """Check if config-changed is executed correctly"""
+        _open = mock.mock_open()
+
+        with mock.patch('__builtin__.open', _open, create=True):
+            hooks.config_changed()
+
+        expected = [
+            mock.call(os.path.join(hooks.get_template_dir(),
+                                   '60-aggregator.conf'), 'rb'),
+            mock.call(os.path.join(hooks.DEFAULT_RSYSLOG_PATH,
+                                   '60-aggregator.conf'), 'w'),
+            mock.call(os.path.join(hooks.get_template_dir(),
+                                   'rsyslog.conf'), 'rb'),
+            mock.call(hooks.DEFAULT_LOGROTATE_PATH, 'w')
+        ]
+
+        self.assertEquals(sorted(_open.call_args_list), sorted(expected))
+        self.service_restart.assert_called_once_with("rsyslog")