Merge lp:~lazypower/charms/trusty/elasticsearch/amulet-test-bump into lp:charms/trusty/elasticsearch

[Charles Butler]

Refactors the tests into a single amulet class
Slight refactoring of the test helper modules inline

elasticsearch
    charm-proof PASS
    make lint PASS
    make test PASS
    00-single-to-scale-test.py PASS

Bundletester seems to like this branch, it passes cleanly on AWS and OpenStack. I have not tested if this has changed the results on GCE failures.

This branch also properly marks hooks as chmod +x instead of relying on Juju to do this for us.

[Chris Glass (tribaal)]

Looks good, +1

Note: the +x changes on symlinks are a little weird, but harmless.

review: Approve

Unmerged revisions

43. By Charles Butler on 2016-05-04

- Merged tests into a single amulet TestClass
- Refactored the tests due to consistent failures when testing on GCE
- minor lint cleanups

=== modified symlink 'hooks/client-relation-departed' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/client-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/client-relation-departed	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/client-relation-joined' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/client-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/client-relation-joined	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/config-changed' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/data-relation-changed' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/data-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/data-relation-changed	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/data-relation-departed' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/data-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/data-relation-departed	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/data-relation-joined' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/data-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/data-relation-joined	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-10-27 22:30:30 +0000
+++ hooks/hooks.py	2016-05-04 03:14:14 +0000
@@ -88,9 +88,10 @@
                            'to: {}'.format(new_path))
     os.chmod(new_path, 0700)
     charmhelpers.core.host.service_stop('elasticsearch')
-    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
-        os.path.join(new_path, ''),
-        options=['--archive'])
+    # Ensure we have trailing slashes
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),
+                                 os.path.join(new_path, ''),
+                                 options=['--archive'])
     shutil.rmtree(old_path)
     os.symlink(new_path, old_path)
     charmhelpers.core.host.service_start('elasticsearch')

=== modified symlink 'hooks/install' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/install	1970-01-01 00:00:00 +0000
+++ hooks/install	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/logs-relation-joined' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/logs-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/logs-relation-joined	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/nrpe-external-master-relation-changed' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/nrpe-external-master-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/nrpe-external-master-relation-changed	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/peer-relation-changed' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/peer-relation-changed	1970-01-01 00:00:00 +0000
+++ hooks/peer-relation-changed	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/peer-relation-departed' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/peer-relation-departed	1970-01-01 00:00:00 +0000
+++ hooks/peer-relation-departed	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/peer-relation-joined' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/peer-relation-joined	1970-01-01 00:00:00 +0000
+++ hooks/peer-relation-joined	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/start' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/start	1970-01-01 00:00:00 +0000
+++ hooks/start	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/stop' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/stop	1970-01-01 00:00:00 +0000
+++ hooks/stop	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== modified symlink 'hooks/upgrade-charm' (properties changed: -x to +x)
=== target was u'hooks.py'
--- hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ hooks/upgrade-charm	2016-05-04 03:14:14 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+"""Setup hooks for the elasticsearch charm."""
+
+import sys
+import charmhelpers.contrib.ansible
+import charmhelpers.payload.execd
+import charmhelpers.core.host
+from charmhelpers.core import hookenv
+import os
+import shutil
+
+mountpoint = '/srv/elasticsearch'
+
+hooks = charmhelpers.contrib.ansible.AnsibleHooks(
+    playbook_path='playbook.yaml',
+    default_hooks=[
+        'config-changed',
+        'cluster-relation-joined',
+        'logs-relation-joined',
+        'data-relation-joined',
+        'data-relation-changed',
+        'data-relation-departed',
+        'data-relation-broken',
+        'peer-relation-joined',
+        'peer-relation-changed',
+        'peer-relation-departed',
+        'nrpe-external-master-relation-changed',
+        'rest-relation-joined',
+        'start',
+        'stop',
+        'upgrade-charm',
+        'client-relation-joined',
+        'client-relation-departed',
+    ])
+
+
[e-mail]('install', 'upgrade-charm')
+def install():
+    """Install ansible before running the tasks tagged with 'install'."""
+    # Allow charm users to run preinstall setup.
+    charmhelpers.payload.execd.execd_preinstall()
+    charmhelpers.contrib.ansible.install_ansible_support(
+        from_ppa=False)
+
+    # We copy the backported ansible modules here because they need to be
+    # in place by the time ansible runs any hook.
+    charmhelpers.core.host.rsync(
+        'ansible_module_backports',
+        '/usr/share/ansible')
+
+
[e-mail]('data-relation-joined', 'data-relation-changed')
+def data_relation():
+    if hookenv.relation_get('mountpoint') == mountpoint:
+        # Other side of relation is ready
+        migrate_to_mount(mountpoint)
+    else:
+        # Other side not ready yet, provide mountpoint
+        hookenv.log('Requesting storage for {}'.format(mountpoint))
+        hookenv.relation_set(mountpoint=mountpoint)
+
+
[e-mail]('data-relation-departed', 'data-relation-broken')
+def data_relation_gone():
+    hookenv.log('Data relation no longer present, stopping elasticsearch.')
+    charmhelpers.core.host.service_stop('elasticsearch')
+
+
+def migrate_to_mount(new_path):
+    """Invoked when new mountpoint appears. This function safely migrates
+    elasticsearch data from local disk to persistent storage (only if needed)
+    """
+    old_path = '/var/lib/elasticsearch'
+    if os.path.islink(old_path):
+        hookenv.log('{} is already a symlink, skipping migration'.format(
+            old_path))
+        return True
+    # Ensure our new mountpoint is empty. Otherwise error and allow
+    # users to investigate and migrate manually
+    files = os.listdir(new_path)
+    try:
+        files.remove('lost+found')
+    except ValueError:
+        pass
+    if files:
+        raise RuntimeError('Persistent storage contains old data. '
+                           'Please investigate and migrate data manually '
+                           'to: {}'.format(new_path))
+    os.chmod(new_path, 0700)
+    charmhelpers.core.host.service_stop('elasticsearch')
+    charmhelpers.core.host.rsync(os.path.join(old_path, ''),  # Ensure we have trailing slashes
+        os.path.join(new_path, ''),
+        options=['--archive'])
+    shutil.rmtree(old_path)
+    os.symlink(new_path, old_path)
+    charmhelpers.core.host.service_start('elasticsearch')
+
+
+if __name__ == "__main__":
+    hooks.execute(sys.argv)

=== removed file 'tests/00-create-index'
--- tests/00-create-index	2014-10-30 01:02:33 +0000
+++ tests/00-create-index	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-#!/usr/bin/python3
-import amulet
-import helpers
-
-
-d = amulet.Deployment(series='trusty')
-
-d.add('elasticsearch')
-
-helpers.setup_deployment(d)
-
-health = helpers.get_cluster_health(d)
-
-if health['status'] not in ('green', 'yellow'):
-    msg = "Elastic Search status is %s" % health['status']
-    amulet.raise_status(amulet.FAIL, msg=msg)
-
-# Create a test index.
-curl_command = """
-curl -XPUT 'http://localhost:9200/test/tweet/1' -d '{
-    "user" : "me",
-    "message" : "testing"
-}'
-"""
-response = helpers.curl_on_unit(curl_command, d)
-
-health = helpers.get_index_health(d, 'test')
-if health['status'] not in ('green', 'yellow'):
-    msg = "Elastic Search test index status is %s." % health['status']
-    amulet.raise_status(amulet.FAIL, msg=msg)
-
-print("Successfully created test index.")

=== added file 'tests/00-single-to-scale-test.py'
--- tests/00-single-to-scale-test.py	1970-01-01 00:00:00 +0000
+++ tests/00-single-to-scale-test.py	2016-05-04 03:14:14 +0000
@@ -0,0 +1,112 @@
+#!/usr/bin/python3
+
+import amulet
+import unittest
+import requests
+import json
+
+class TestElasticsearch(unittest.TestCase):
+
+    @classmethod
+    def setUpClass(self):
+        self.deployment = amulet.Deployment(series='trusty')
+        self.deployment.add('elasticsearch')
+        self.deployment.configure('elasticsearch',
+                                  {'cluster-name': 'unique-name'})
+
+        try:
+            self.deployment.setup(timeout=1200)
+            self.deployment.sentry.wait()
+        except amulet.helpers.TimeoutError:
+            amulet.raise_status(
+                amulet.SKIP, msg="Environment wasn't setup in time")
+
+
+    def test_health(self):
+        ''' Test the health of the node upon first deployment
+            by getting the cluster health, then inserting data and
+            validating cluster health'''
+        health = self.get_cluster_health()
+        assert health['status'] in ('green', 'yellow')
+
+        # Create a test index.
+        curl_command = """
+        curl -XPUT 'http://localhost:9200/test/tweet/1' -d '{
+            "user" : "me",
+            "message" : "testing"
+        }'
+        """
+        response = self.curl_on_unit(curl_command)
+        health = self.get_index_health('test')
+        assert health['status'] in ('green', 'yellow')
+
+    def test_config(self):
+        ''' Validate our configuration of the cluster name made it to the
+            application configuration'''
+        health = self.get_cluster_health()
+        cluster_name = health['cluster_name']
+        assert cluster_name == 'unique-name'
+
+    def test_scale(self):
+        ''' Validate scaling the elasticsearch cluster yields a healthy
+            response from the API, and all units are participating '''
+        self.deployment.add_unit('elasticsearch', units=2)
+        self.deployment.setup(timeout=1200)
+        self.deployment.sentry.wait()
+        health = self.get_cluster_health(wait_for_nodes=3)
+        index_health = self.get_index_health('test')
+        print(health['number_of_nodes'])
+        assert health['number_of_nodes'] == 3
+        assert index_health['status'] in ('green', 'yellow')
+
+    def curl_on_unit(self, curl_command, unit_number=0):
+        unit = "elasticsearch"
+        response = self.deployment.sentry[unit][unit_number].run(curl_command)
+        if response[1] != 0:
+            msg = (
+                "Elastic search didn't respond to the command \n"
+                "'{curl_command}' as expected.\n"
+                "Return code: {return_code}\n"
+                "Result: {result}".format(
+                    curl_command=curl_command,
+                    return_code=response[1],
+                    result=response[0])
+            )
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+        return json.loads(response[0])
+
+    def get_cluster_health(self, unit_number=0, wait_for_nodes=0,
+                           timeout=180):
+        curl_command = "curl http://localhost:9200"
+        curl_command = curl_command + "/_cluster/health?timeout={}s".format(
+            timeout)
+        if wait_for_nodes > 0:
+            curl_command = curl_command + "&wait_for_nodes={}".format(
+                wait_for_nodes)
+
+        return self.curl_on_unit(curl_command, unit_number=unit_number)
+
+    def get_index_health(self, index_name, unit_number=0):
+        curl_command = "curl http://localhost:9200"
+        curl_command = curl_command + "/_cluster/health/" + index_name
+
+        return self.curl_on_unit(curl_command)
+
+
+def check_response(response, expected_code=200):
+    if response.status_code != expected_code:
+        msg = (
+            "Elastic search did not respond as expected. \n"
+            "Expected status code: %{expected_code} \n"
+            "Status code: %{status_code} \n"
+            "Response text: %{response_text}".format(
+                expected_code=expected_code,
+                status_code=response.status_code,
+                response_text=response.text))
+
+        amulet.raise_status(amulet.FAIL, msg=msg)
+
+
+if __name__ == "__main__":
+    unittest.main()

=== removed file 'tests/01-config-changes'
--- tests/01-config-changes	2014-10-30 01:02:33 +0000
+++ tests/01-config-changes	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-#!/usr/bin/python3
-import amulet
-import helpers
-
-d = amulet.Deployment(series='trusty')
-
-d.add('elasticsearch')
-config = {'cluster-name': 'unique-name'}
-d.configure('elasticsearch', config)
-
-helpers.setup_deployment(d)
-
-health = helpers.get_cluster_health(d)
-
-cluster_name = health['cluster_name']
-
-if cluster_name != 'unique-name':
-    msg = ("Expected cluster name to be 'unique-name' "
-           "but was '{}'.".format(cluster_name))
-    amulet.raise_status(amulet.FAIL, msg=msg)
-
-print("Successfully created cluster with non-default cluster-name.")

=== removed file 'tests/02-deploy-three-units'
--- tests/02-deploy-three-units	2014-10-30 01:02:33 +0000
+++ tests/02-deploy-three-units	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/usr/bin/python3
-import amulet
-import helpers
-
-d = amulet.Deployment(series='trusty')
-
-d.add('elasticsearch', units=3)
-
-helpers.setup_deployment(d)
-
-health = helpers.get_cluster_health(d, wait_for_nodes=3)
-
-if health['number_of_nodes'] != 3:
-    amulet.raise_status(amulet.FAIL, msg=msg)
-    msg = ("Expected at least 3 nodes in cluster with 3 units deployed, "
-           "got {}".format(health['number_of_nodes']))
-
-print("Successfully deployed cluster of 3 units.")

=== removed file 'tests/__init__.py'
=== removed directory 'tests/helpers'
=== removed file 'tests/helpers/__init__.py'
--- tests/helpers/__init__.py	2014-10-30 01:02:33 +0000
+++ tests/helpers/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
-import amulet
-import json
-
-
-def check_response(response, expected_code=200):
-    if response.status_code != expected_code:
-        msg = (
-            "Elastic search did not respond as expected. \n"
-            "Expected status code: %{expected_code} \n"
-            "Status code: %{status_code} \n"
-            "Response text: %{response_text}".format(
-                expected_code=expected_code,
-                status_code=response.status_code,
-                response_text=response.text))
-
-        amulet.raise_status(amulet.FAIL, msg=msg)
-
-
-def curl_on_unit(curl_command, deployment, unit_number=0):
-    unit = "elasticsearch/{}".format(unit_number)
-
-    response = deployment.sentry.unit[unit].run(curl_command)
-    if response[1] != 0:
-        msg = (
-            "Elastic search didn't respond to the command \n"
-            "'{curl_command}' as expected.\n"
-            "Return code: {return_code}\n"
-            "Result: {result}".format(
-                curl_command=curl_command,
-                return_code=response[1],
-                result=response[0])
-        )
-        amulet.raise_status(amulet.FAIL, msg=msg)
-
-    return json.loads(response[0])
-
-
-def setup_deployment(deployment, timeout=900):
-    """Setup the deployment and wait until installed."""
-    try:
-        deployment.setup(timeout=timeout)
-        deployment.sentry.wait()
-    except amulet.helpers.TimeoutError:
-        amulet.raise_status(
-            amulet.SKIP, msg="Environment wasn't setup in time")
-
-
-def get_cluster_health(deployment, unit_number=0, wait_for_nodes=0,
-                       timeout=180):
-    curl_command = "curl http://localhost:9200"
-    curl_command = curl_command + "/_cluster/health?timeout={}s".format(
-        timeout)
-    if wait_for_nodes > 0:
-        curl_command = curl_command + "&wait_for_nodes={}".format(
-            wait_for_nodes)
-
-    return curl_on_unit(curl_command, deployment, unit_number=unit_number)
-
-
-def get_index_health(deployment, index_name, unit_number=0):
-    curl_command = "curl http://localhost:9200"
-    curl_command = curl_command + "/_cluster/health/" + index_name
-
-    return curl_on_unit(curl_command, deployment)

=== added file 'tests/tests.yaml'
--- tests/tests.yaml	1970-01-01 00:00:00 +0000
+++ tests/tests.yaml	2016-05-04 03:14:14 +0000
@@ -0,0 +1,2 @@
+packages:
+  - python3-amulet