Merge lp:~narindergupta/charms/trusty/neutron-api-odl/liberty into lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp

[Narinder Gupta]

updates with charm helpers sync and modified as per kilo changes.

[Liam Young (gnuoy)]

What is the vpp.patch included in this mp, was it included in error?

review: Needs Information

[Narinder Gupta (narindergupta)]

> What is the vpp.patch included in this mp, was it included in error?

This patch only sync the charm helpers so that liberty also can be deployed.

Unmerged revisions

5. By Narinder Gupta on 2015-10-31

add support for liberty after charmer sync

=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-11-03 04:19:02 +0000
@@ -44,7 +44,7 @@
            Determine if the local branch being tested is derived from its
            stable or next (dev) branch, and based on this, use the corresonding
            stable or next branches for the other_services."""
-        base_charms = ['mysql', 'mongodb']
+        base_charms = ['mysql', 'mongodb', 'nrpe']
 
         if self.series in ['precise', 'trusty']:
             base_series = self.series
@@ -83,9 +83,10 @@
         services.append(this_service)
         use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
                       'ceph-osd', 'ceph-radosgw']
-        # Openstack subordinate charms do not expose an origin option as that
-        # is controlled by the principle
-        ignore = ['neutron-openvswitch', 'cisco-vpp']
+        # Most OpenStack subordinate charms do not expose an origin option
+        # as that is controlled by the principle.
+        ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
+                  'cisco-vpp', 'odl-controller']
 
         if self.openstack:
             for svc in services:
@@ -152,3 +153,36 @@
             return os_origin.split('%s-' % self.series)[1].split('/')[0]
         else:
             return releases[self.series]
+
+    def get_ceph_expected_pools(self, radosgw=False):
+        """Return a list of expected ceph pools in a ceph + cinder + glance
+        test scenario, based on OpenStack release and whether ceph radosgw
+        is flagged as present or not."""
+
+        if self._get_openstack_release() >= self.trusty_kilo:
+            # Kilo or later
+            pools = [
+                'rbd',
+                'cinder',
+                'glance'
+            ]
+        else:
+            # Juno or earlier
+            pools = [
+                'data',
+                'metadata',
+                'rbd',
+                'cinder',
+                'glance'
+            ]
+
+        if radosgw:
+            pools.extend([
+                '.rgw.root',
+                '.rgw.control',
+                '.rgw',
+                '.rgw.gc',
+                '.users.uid'
+            ])
+
+        return pools

=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/utils.py'
--- hooks/charmhelpers/contrib/openstack/amulet/utils.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/contrib/openstack/amulet/utils.py	2015-11-03 04:19:02 +0000
@@ -14,16 +14,20 @@
 # You should have received a copy of the GNU Lesser General Public License
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
+import amulet
+import json
 import logging
 import os
+import six
 import time
 import urllib
 
+import cinderclient.v1.client as cinder_client
 import glanceclient.v1.client as glance_client
+import heatclient.v1.client as heat_client
 import keystoneclient.v2_0 as keystone_client
 import novaclient.v1_1.client as nova_client
-
-import six
+import swiftclient
 
 from charmhelpers.contrib.amulet.utils import (
     AmuletUtils
@@ -37,7 +41,7 @@
     """OpenStack amulet utilities.
 
        This class inherits from AmuletUtils and has additional support
-       that is specifically for use by OpenStack charms.
+       that is specifically for use by OpenStack charm tests.
        """
 
     def __init__(self, log_level=ERROR):
@@ -51,6 +55,8 @@
            Validate actual endpoint data vs expected endpoint data. The ports
            are used to find the matching endpoint.
            """
+        self.log.debug('Validating endpoint data...')
+        self.log.debug('actual: {}'.format(repr(endpoints)))
         found = False
         for ep in endpoints:
             self.log.debug('endpoint: {}'.format(repr(ep)))
@@ -77,6 +83,7 @@
            Validate a list of actual service catalog endpoints vs a list of
            expected service catalog endpoints.
            """
+        self.log.debug('Validating service catalog endpoint data...')
         self.log.debug('actual: {}'.format(repr(actual)))
         for k, v in six.iteritems(expected):
             if k in actual:
@@ -93,6 +100,7 @@
            Validate a list of actual tenant data vs list of expected tenant
            data.
            """
+        self.log.debug('Validating tenant data...')
         self.log.debug('actual: {}'.format(repr(actual)))
         for e in expected:
             found = False
@@ -114,6 +122,7 @@
            Validate a list of actual role data vs a list of expected role
            data.
            """
+        self.log.debug('Validating role data...')
         self.log.debug('actual: {}'.format(repr(actual)))
         for e in expected:
             found = False
@@ -134,6 +143,7 @@
            Validate a list of actual user data vs a list of expected user
            data.
            """
+        self.log.debug('Validating user data...')
         self.log.debug('actual: {}'.format(repr(actual)))
         for e in expected:
             found = False
@@ -155,17 +165,30 @@
 
            Validate a list of actual flavors vs a list of expected flavors.
            """
+        self.log.debug('Validating flavor data...')
         self.log.debug('actual: {}'.format(repr(actual)))
         act = [a.name for a in actual]
         return self._validate_list_data(expected, act)
 
     def tenant_exists(self, keystone, tenant):
         """Return True if tenant exists."""
+        self.log.debug('Checking if tenant exists ({})...'.format(tenant))
         return tenant in [t.name for t in keystone.tenants.list()]
 
+    def authenticate_cinder_admin(self, keystone_sentry, username,
+                                  password, tenant):
+        """Authenticates admin user with cinder."""
+        # NOTE(beisner): cinder python client doesn't accept tokens.
+        service_ip = \
+            keystone_sentry.relation('shared-db',
+                                     'mysql:shared-db')['private-address']
+        ept = "http://{}:5000/v2.0".format(service_ip.strip().decode('utf-8'))
+        return cinder_client.Client(username, password, tenant, ept)
+
     def authenticate_keystone_admin(self, keystone_sentry, user, password,
                                     tenant):
         """Authenticates admin user with the keystone admin endpoint."""
+        self.log.debug('Authenticating keystone admin...')
         unit = keystone_sentry
         service_ip = unit.relation('shared-db',
                                    'mysql:shared-db')['private-address']
@@ -175,6 +198,7 @@
 
     def authenticate_keystone_user(self, keystone, user, password, tenant):
         """Authenticates a regular user with the keystone public endpoint."""
+        self.log.debug('Authenticating keystone user ({})...'.format(user))
         ep = keystone.service_catalog.url_for(service_type='identity',
                                               endpoint_type='publicURL')
         return keystone_client.Client(username=user, password=password,
@@ -182,19 +206,49 @@
 
     def authenticate_glance_admin(self, keystone):
         """Authenticates admin user with glance."""
+        self.log.debug('Authenticating glance admin...')
         ep = keystone.service_catalog.url_for(service_type='image',
                                               endpoint_type='adminURL')
         return glance_client.Client(ep, token=keystone.auth_token)
 
+    def authenticate_heat_admin(self, keystone):
+        """Authenticates the admin user with heat."""
+        self.log.debug('Authenticating heat admin...')
+        ep = keystone.service_catalog.url_for(service_type='orchestration',
+                                              endpoint_type='publicURL')
+        return heat_client.Client(endpoint=ep, token=keystone.auth_token)
+
     def authenticate_nova_user(self, keystone, user, password, tenant):
         """Authenticates a regular user with nova-api."""
+        self.log.debug('Authenticating nova user ({})...'.format(user))
         ep = keystone.service_catalog.url_for(service_type='identity',
                                               endpoint_type='publicURL')
         return nova_client.Client(username=user, api_key=password,
                                   project_id=tenant, auth_url=ep)
 
+    def authenticate_swift_user(self, keystone, user, password, tenant):
+        """Authenticates a regular user with swift api."""
+        self.log.debug('Authenticating swift user ({})...'.format(user))
+        ep = keystone.service_catalog.url_for(service_type='identity',
+                                              endpoint_type='publicURL')
+        return swiftclient.Connection(authurl=ep,
+                                      user=user,
+                                      key=password,
+                                      tenant_name=tenant,
+                                      auth_version='2.0')
+
     def create_cirros_image(self, glance, image_name):
-        """Download the latest cirros image and upload it to glance."""
+        """Download the latest cirros image and upload it to glance,
+        validate and return a resource pointer.
+
+        :param glance: pointer to authenticated glance connection
+        :param image_name: display name for new image
+        :returns: glance image pointer
+        """
+        self.log.debug('Creating glance cirros image '
+                       '({})...'.format(image_name))
+
+        # Download cirros image
         http_proxy = os.getenv('AMULET_HTTP_PROXY')
         self.log.debug('AMULET_HTTP_PROXY: {}'.format(http_proxy))
         if http_proxy:
@@ -203,57 +257,67 @@
         else:
             opener = urllib.FancyURLopener()
 
-        f = opener.open("http://download.cirros-cloud.net/version/released")
+        f = opener.open('http://download.cirros-cloud.net/version/released')
         version = f.read().strip()
-        cirros_img = "cirros-{}-x86_64-disk.img".format(version)
+        cirros_img = 'cirros-{}-x86_64-disk.img'.format(version)
         local_path = os.path.join('tests', cirros_img)
 
         if not os.path.exists(local_path):
-            cirros_url = "http://{}/{}/{}".format("download.cirros-cloud.net",
+            cirros_url = 'http://{}/{}/{}'.format('download.cirros-cloud.net',
                                                   version, cirros_img)
             opener.retrieve(cirros_url, local_path)
         f.close()
 
+        # Create glance image
         with open(local_path) as f:
             image = glance.images.create(name=image_name, is_public=True,
                                          disk_format='qcow2',
                                          container_format='bare', data=f)
-        count = 1
-        status = image.status
-        while status != 'active' and count < 10:
-            time.sleep(3)
-            image = glance.images.get(image.id)
-            status = image.status
-            self.log.debug('image status: {}'.format(status))
-            count += 1
-
-        if status != 'active':
-            self.log.error('image creation timed out')
-            return None
+
+        # Wait for image to reach active status
+        img_id = image.id
+        ret = self.resource_reaches_status(glance.images, img_id,
+                                           expected_stat='active',
+                                           msg='Image status wait')
+        if not ret:
+            msg = 'Glance image failed to reach expected state.'
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+        # Re-validate new image
+        self.log.debug('Validating image attributes...')
+        val_img_name = glance.images.get(img_id).name
+        val_img_stat = glance.images.get(img_id).status
+        val_img_pub = glance.images.get(img_id).is_public
+        val_img_cfmt = glance.images.get(img_id).container_format
+        val_img_dfmt = glance.images.get(img_id).disk_format
+        msg_attr = ('Image attributes - name:{} public:{} id:{} stat:{} '
+                    'container fmt:{} disk fmt:{}'.format(
+                        val_img_name, val_img_pub, img_id,
+                        val_img_stat, val_img_cfmt, val_img_dfmt))
+
+        if val_img_name == image_name and val_img_stat == 'active' \
+                and val_img_pub is True and val_img_cfmt == 'bare' \
+                and val_img_dfmt == 'qcow2':
+            self.log.debug(msg_attr)
+        else:
+            msg = ('Volume validation failed, {}'.format(msg_attr))
+            amulet.raise_status(amulet.FAIL, msg=msg)
 
         return image
 
     def delete_image(self, glance, image):
         """Delete the specified image."""
-        num_before = len(list(glance.images.list()))
-        glance.images.delete(image)
-
-        count = 1
-        num_after = len(list(glance.images.list()))
-        while num_after != (num_before - 1) and count < 10:
-            time.sleep(3)
-            num_after = len(list(glance.images.list()))
-            self.log.debug('number of images: {}'.format(num_after))
-            count += 1
-
-        if num_after != (num_before - 1):
-            self.log.error('image deletion timed out')
-            return False
-
-        return True
+
+        # /!\ DEPRECATION WARNING
+        self.log.warn('/!\\ DEPRECATION WARNING:  use '
+                      'delete_resource instead of delete_image.')
+        self.log.debug('Deleting glance image ({})...'.format(image))
+        return self.delete_resource(glance.images, image, msg='glance image')
 
     def create_instance(self, nova, image_name, instance_name, flavor):
         """Create the specified instance."""
+        self.log.debug('Creating instance '
+                       '({}|{}|{})'.format(instance_name, image_name, flavor))
         image = nova.images.find(name=image_name)
         flavor = nova.flavors.find(name=flavor)
         instance = nova.servers.create(name=instance_name, image=image,
@@ -276,19 +340,265 @@
 
     def delete_instance(self, nova, instance):
         """Delete the specified instance."""
-        num_before = len(list(nova.servers.list()))
-        nova.servers.delete(instance)
-
-        count = 1
-        num_after = len(list(nova.servers.list()))
-        while num_after != (num_before - 1) and count < 10:
-            time.sleep(3)
-            num_after = len(list(nova.servers.list()))
-            self.log.debug('number of instances: {}'.format(num_after))
-            count += 1
-
-        if num_after != (num_before - 1):
-            self.log.error('instance deletion timed out')
-            return False
-
-        return True
+
+        # /!\ DEPRECATION WARNING
+        self.log.warn('/!\\ DEPRECATION WARNING:  use '
+                      'delete_resource instead of delete_instance.')
+        self.log.debug('Deleting instance ({})...'.format(instance))
+        return self.delete_resource(nova.servers, instance,
+                                    msg='nova instance')
+
+    def create_or_get_keypair(self, nova, keypair_name="testkey"):
+        """Create a new keypair, or return pointer if it already exists."""
+        try:
+            _keypair = nova.keypairs.get(keypair_name)
+            self.log.debug('Keypair ({}) already exists, '
+                           'using it.'.format(keypair_name))
+            return _keypair
+        except:
+            self.log.debug('Keypair ({}) does not exist, '
+                           'creating it.'.format(keypair_name))
+
+        _keypair = nova.keypairs.create(name=keypair_name)
+        return _keypair
+
+    def create_cinder_volume(self, cinder, vol_name="demo-vol", vol_size=1,
+                             img_id=None, src_vol_id=None, snap_id=None):
+        """Create cinder volume, optionally from a glance image, OR
+        optionally as a clone of an existing volume, OR optionally
+        from a snapshot.  Wait for the new volume status to reach
+        the expected status, validate and return a resource pointer.
+
+        :param vol_name: cinder volume display name
+        :param vol_size: size in gigabytes
+        :param img_id: optional glance image id
+        :param src_vol_id: optional source volume id to clone
+        :param snap_id: optional snapshot id to use
+        :returns: cinder volume pointer
+        """
+        # Handle parameter input and avoid impossible combinations
+        if img_id and not src_vol_id and not snap_id:
+            # Create volume from image
+            self.log.debug('Creating cinder volume from glance image...')
+            bootable = 'true'
+        elif src_vol_id and not img_id and not snap_id:
+            # Clone an existing volume
+            self.log.debug('Cloning cinder volume...')
+            bootable = cinder.volumes.get(src_vol_id).bootable
+        elif snap_id and not src_vol_id and not img_id:
+            # Create volume from snapshot
+            self.log.debug('Creating cinder volume from snapshot...')
+            snap = cinder.volume_snapshots.find(id=snap_id)
+            vol_size = snap.size
+            snap_vol_id = cinder.volume_snapshots.get(snap_id).volume_id
+            bootable = cinder.volumes.get(snap_vol_id).bootable
+        elif not img_id and not src_vol_id and not snap_id:
+            # Create volume
+            self.log.debug('Creating cinder volume...')
+            bootable = 'false'
+        else:
+            # Impossible combination of parameters
+            msg = ('Invalid method use - name:{} size:{} img_id:{} '
+                   'src_vol_id:{} snap_id:{}'.format(vol_name, vol_size,
+                                                     img_id, src_vol_id,
+                                                     snap_id))
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+        # Create new volume
+        try:
+            vol_new = cinder.volumes.create(display_name=vol_name,
+                                            imageRef=img_id,
+                                            size=vol_size,
+                                            source_volid=src_vol_id,
+                                            snapshot_id=snap_id)
+            vol_id = vol_new.id
+        except Exception as e:
+            msg = 'Failed to create volume: {}'.format(e)
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+        # Wait for volume to reach available status
+        ret = self.resource_reaches_status(cinder.volumes, vol_id,
+                                           expected_stat="available",
+                                           msg="Volume status wait")
+        if not ret:
+            msg = 'Cinder volume failed to reach expected state.'
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+        # Re-validate new volume
+        self.log.debug('Validating volume attributes...')
+        val_vol_name = cinder.volumes.get(vol_id).display_name
+        val_vol_boot = cinder.volumes.get(vol_id).bootable
+        val_vol_stat = cinder.volumes.get(vol_id).status
+        val_vol_size = cinder.volumes.get(vol_id).size
+        msg_attr = ('Volume attributes - name:{} id:{} stat:{} boot:'
+                    '{} size:{}'.format(val_vol_name, vol_id,
+                                        val_vol_stat, val_vol_boot,
+                                        val_vol_size))
+
+        if val_vol_boot == bootable and val_vol_stat == 'available' \
+                and val_vol_name == vol_name and val_vol_size == vol_size:
+            self.log.debug(msg_attr)
+        else:
+            msg = ('Volume validation failed, {}'.format(msg_attr))
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+        return vol_new
+
+    def delete_resource(self, resource, resource_id,
+                        msg="resource", max_wait=120):
+        """Delete one openstack resource, such as one instance, keypair,
+        image, volume, stack, etc., and confirm deletion within max wait time.
+
+        :param resource: pointer to os resource type, ex:glance_client.images
+        :param resource_id: unique name or id for the openstack resource
+        :param msg: text to identify purpose in logging
+        :param max_wait: maximum wait time in seconds
+        :returns: True if successful, otherwise False
+        """
+        self.log.debug('Deleting OpenStack resource '
+                       '{} ({})'.format(resource_id, msg))
+        num_before = len(list(resource.list()))
+        resource.delete(resource_id)
+
+        tries = 0
+        num_after = len(list(resource.list()))
+        while num_after != (num_before - 1) and tries < (max_wait / 4):
+            self.log.debug('{} delete check: '
+                           '{} [{}:{}] {}'.format(msg, tries,
+                                                  num_before,
+                                                  num_after,
+                                                  resource_id))
+            time.sleep(4)
+            num_after = len(list(resource.list()))
+            tries += 1
+
+        self.log.debug('{}:  expected, actual count = {}, '
+                       '{}'.format(msg, num_before - 1, num_after))
+
+        if num_after == (num_before - 1):
+            return True
+        else:
+            self.log.error('{} delete timed out'.format(msg))
+            return False
+
+    def resource_reaches_status(self, resource, resource_id,
+                                expected_stat='available',
+                                msg='resource', max_wait=120):
+        """Wait for an openstack resources status to reach an
+           expected status within a specified time.  Useful to confirm that
+           nova instances, cinder vols, snapshots, glance images, heat stacks
+           and other resources eventually reach the expected status.
+
+        :param resource: pointer to os resource type, ex: heat_client.stacks
+        :param resource_id: unique id for the openstack resource
+        :param expected_stat: status to expect resource to reach
+        :param msg: text to identify purpose in logging
+        :param max_wait: maximum wait time in seconds
+        :returns: True if successful, False if status is not reached
+        """
+
+        tries = 0
+        resource_stat = resource.get(resource_id).status
+        while resource_stat != expected_stat and tries < (max_wait / 4):
+            self.log.debug('{} status check: '
+                           '{} [{}:{}] {}'.format(msg, tries,
+                                                  resource_stat,
+                                                  expected_stat,
+                                                  resource_id))
+            time.sleep(4)
+            resource_stat = resource.get(resource_id).status
+            tries += 1
+
+        self.log.debug('{}:  expected, actual status = {}, '
+                       '{}'.format(msg, resource_stat, expected_stat))
+
+        if resource_stat == expected_stat:
+            return True
+        else:
+            self.log.debug('{} never reached expected status: '
+                           '{}'.format(resource_id, expected_stat))
+            return False
+
+    def get_ceph_osd_id_cmd(self, index):
+        """Produce a shell command that will return a ceph-osd id."""
+        return ("`initctl list | grep 'ceph-osd ' | "
+                "awk 'NR=={} {{ print $2 }}' | "
+                "grep -o '[0-9]*'`".format(index + 1))
+
+    def get_ceph_pools(self, sentry_unit):
+        """Return a dict of ceph pools from a single ceph unit, with
+        pool name as keys, pool id as vals."""
+        pools = {}
+        cmd = 'sudo ceph osd lspools'
+        output, code = sentry_unit.run(cmd)
+        if code != 0:
+            msg = ('{} `{}` returned {} '
+                   '{}'.format(sentry_unit.info['unit_name'],
+                               cmd, code, output))
+            amulet.raise_status(amulet.FAIL, msg=msg)
+
+        # Example output: 0 data,1 metadata,2 rbd,3 cinder,4 glance,
+        for pool in str(output).split(','):
+            pool_id_name = pool.split(' ')
+            if len(pool_id_name) == 2:
+                pool_id = pool_id_name[0]
+                pool_name = pool_id_name[1]
+                pools[pool_name] = int(pool_id)
+
+        self.log.debug('Pools on {}: {}'.format(sentry_unit.info['unit_name'],
+                                                pools))
+        return pools
+
+    def get_ceph_df(self, sentry_unit):
+        """Return dict of ceph df json output, including ceph pool state.
+
+        :param sentry_unit: Pointer to amulet sentry instance (juju unit)
+        :returns: Dict of ceph df output
+        """
+        cmd = 'sudo ceph df --format=json'
+        output, code = sentry_unit.run(cmd)
+        if code != 0:
+            msg = ('{} `{}` returned {} '
+                   '{}'.format(sentry_unit.info['unit_name'],
+                               cmd, code, output))
+            amulet.raise_status(amulet.FAIL, msg=msg)
+        return json.loads(output)
+
+    def get_ceph_pool_sample(self, sentry_unit, pool_id=0):
+        """Take a sample of attributes of a ceph pool, returning ceph
+        pool name, object count and disk space used for the specified
+        pool ID number.
+
+        :param sentry_unit: Pointer to amulet sentry instance (juju unit)
+        :param pool_id: Ceph pool ID
+        :returns: List of pool name, object count, kb disk space used
+        """
+        df = self.get_ceph_df(sentry_unit)
+        pool_name = df['pools'][pool_id]['name']
+        obj_count = df['pools'][pool_id]['stats']['objects']
+        kb_used = df['pools'][pool_id]['stats']['kb_used']
+        self.log.debug('Ceph {} pool (ID {}): {} objects, '
+                       '{} kb used'.format(pool_name, pool_id,
+                                           obj_count, kb_used))
+        return pool_name, obj_count, kb_used
+
+    def validate_ceph_pool_samples(self, samples, sample_type="resource pool"):
+        """Validate ceph pool samples taken over time, such as pool
+        object counts or pool kb used, before adding, after adding, and
+        after deleting items which affect those pool attributes.  The
+        2nd element is expected to be greater than the 1st; 3rd is expected
+        to be less than the 2nd.
+
+        :param samples: List containing 3 data samples
+        :param sample_type: String for logging and usage context
+        :returns: None if successful, Failure message otherwise
+        """
+        original, created, deleted = range(3)
+        if samples[created] <= samples[original] or \
+                samples[deleted] >= samples[created]:
+            return ('Ceph {} samples ({}) '
+                    'unexpected.'.format(sample_type, samples))
+        else:
+            self.log.debug('Ceph {} samples (OK): '
+                           '{}'.format(sample_type, samples))
+            return None

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2015-11-03 04:19:02 +0000
@@ -122,21 +122,24 @@
          of specifying multiple key value pairs within the same string. For
          example, a string in the format of 'key1=value1, key2=value2' will
          return a dict of:
-         {'key1': 'value1',
-          'key2': 'value2'}.
+
+             {'key1': 'value1',
+              'key2': 'value2'}.
 
       2. A string in the above format, but supporting a comma-delimited list
          of values for the same key. For example, a string in the format of
          'key1=value1, key2=value3,value4,value5' will return a dict of:
-         {'key1', 'value1',
-          'key2', 'value2,value3,value4'}
+
+             {'key1', 'value1',
+              'key2', 'value2,value3,value4'}
 
       3. A string containing a colon character (:) prior to an equal
          character (=) will be treated as yaml and parsed as such. This can be
          used to specify more complex key value pairs. For example,
          a string in the format of 'key1: subkey1=value1, subkey2=value2' will
          return a dict of:
-         {'key1', 'subkey1=value1, subkey2=value2'}
+
+             {'key1', 'subkey1=value1, subkey2=value2'}
 
     The provided config_flags string may be a list of comma-separated values
     which themselves may be comma-separated list of values.
@@ -240,7 +243,7 @@
         if self.relation_prefix:
             password_setting = self.relation_prefix + '_password'
 
-        for rid in relation_ids('shared-db'):
+        for rid in relation_ids(self.interfaces[0]):
             for unit in related_units(rid):
                 rdata = relation_get(rid=rid, unit=unit)
                 host = rdata.get('db_host')
@@ -891,8 +894,6 @@
         return ctxt
 
     def __call__(self):
-        self._ensure_packages()
-
         if self.network_manager not in ['quantum', 'neutron']:
             return {}
 
@@ -1050,13 +1051,22 @@
         :param config_file : Service's config file to query sections
         :param interface   : Subordinate interface to inspect
         """
-        self.service = service
         self.config_file = config_file
-        self.interface = interface
+        if isinstance(service, list):
+            self.services = service
+        else:
+            self.services = [service]
+        if isinstance(interface, list):
+            self.interfaces = interface
+        else:
+            self.interfaces = [interface]
 
     def __call__(self):
         ctxt = {'sections': {}}
-        for rid in relation_ids(self.interface):
+        rids = []
+        for interface in self.interfaces:
+            rids.extend(relation_ids(interface))
+        for rid in rids:
             for unit in related_units(rid):
                 sub_config = relation_get('subordinate_configuration',
                                           rid=rid, unit=unit)
@@ -1068,29 +1078,32 @@
                             'setting from %s' % rid, level=ERROR)
                         continue
 
-                    if self.service not in sub_config:
-                        log('Found subordinate_config on %s but it contained'
-                            'nothing for %s service' % (rid, self.service),
-                            level=INFO)
-                        continue
-
-                    sub_config = sub_config[self.service]
-                    if self.config_file not in sub_config:
-                        log('Found subordinate_config on %s but it contained'
-                            'nothing for %s' % (rid, self.config_file),
-                            level=INFO)
-                        continue
-
-                    sub_config = sub_config[self.config_file]
-                    for k, v in six.iteritems(sub_config):
-                        if k == 'sections':
-                            for section, config_dict in six.iteritems(v):
-                                log("adding section '%s'" % (section),
-                                    level=DEBUG)
-                                ctxt[k][section] = config_dict
-                        else:
-                            ctxt[k] = v
-
+                    for service in self.services:
+                        if service not in sub_config:
+                            log('Found subordinate_config on %s but it contained'
+                                'nothing for %s service' % (rid, service),
+                                level=INFO)
+                            continue
+
+                        sub_config = sub_config[service]
+                        if self.config_file not in sub_config:
+                            log('Found subordinate_config on %s but it contained'
+                                'nothing for %s' % (rid, self.config_file),
+                                level=INFO)
+                            continue
+
+                        sub_config = sub_config[self.config_file]
+                        for k, v in six.iteritems(sub_config):
+                            if k == 'sections':
+                                for section, config_list in six.iteritems(v):
+                                    log("adding section '%s'" % (section),
+                                        level=DEBUG)
+                                    if ctxt[k].get(section):
+                                        ctxt[k][section].extend(config_list)
+                                    else:
+                                        ctxt[k][section] = config_list
+                            else:
+                                ctxt[k] = v
         log("%d section(s) found" % (len(ctxt['sections'])), level=DEBUG)
         return ctxt
 

=== modified file 'hooks/charmhelpers/contrib/openstack/templates/ceph.conf'
--- hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2015-11-03 04:19:02 +0000
@@ -5,11 +5,11 @@
 ###############################################################################
 [global]
 {% if auth -%}
- auth_supported = {{ auth }}
- keyring = /etc/ceph/$cluster.$name.keyring
- mon host = {{ mon_hosts }}
+auth_supported = {{ auth }}
+keyring = /etc/ceph/$cluster.$name.keyring
+mon host = {{ mon_hosts }}
 {% endif -%}
- log to syslog = {{ use_syslog }}
- err to syslog = {{ use_syslog }}
- clog to syslog = {{ use_syslog }}
+log to syslog = {{ use_syslog }}
+err to syslog = {{ use_syslog }}
+clog to syslog = {{ use_syslog }}
 

=== modified file 'hooks/charmhelpers/contrib/openstack/templating.py'
--- hooks/charmhelpers/contrib/openstack/templating.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/contrib/openstack/templating.py	2015-11-03 04:19:02 +0000
@@ -29,14 +29,13 @@
 try:
     from jinja2 import FileSystemLoader, ChoiceLoader, Environment, exceptions
 except ImportError:
-    # python-jinja2 may not be installed yet, or we're running unittests.
-    FileSystemLoader = ChoiceLoader = Environment = exceptions = None
+    apt_install('python-jinja2', fatal=True)
+    from jinja2 import FileSystemLoader, ChoiceLoader, Environment, exceptions
 
 
 class OSConfigException(Exception):
     pass
 
-
 def os_template_dirs(templates_dir, os_release):
     tmpl_dirs = [(rel, os.path.join(templates_dir, rel))
                  for rel in six.itervalues(OPENSTACK_CODENAMES)]
@@ -61,7 +60,6 @@
         ' '.join(dirs), level=INFO)
     return dirs
 
-
 def get_loader(templates_dir, os_release):
     """
     Create a jinja2.ChoiceLoader containing template dirs up to

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2015-11-03 04:19:02 +0000
@@ -25,6 +25,7 @@
 import os
 import sys
 import uuid
+import re
 
 import six
 import yaml
@@ -42,7 +43,7 @@
     INFO,
     relation_ids,
     related_units,
-    relation_set,
+    relation_set
 )
 
 from charmhelpers.contrib.storage.linux.lvm import (
@@ -71,7 +72,6 @@
 DISTRO_PROPOSED = ('deb http://archive.ubuntu.com/ubuntu/ %s-proposed '
                    'restricted main multiverse universe')
 
-
 UBUNTU_OPENSTACK_RELEASE = OrderedDict([
     ('oneiric', 'diablo'),
     ('precise', 'essex'),
@@ -81,6 +81,7 @@
     ('trusty', 'icehouse'),
     ('utopic', 'juno'),
     ('vivid', 'kilo'),
+    ('wily', 'liberty'),
 ])
 
 
@@ -93,6 +94,7 @@
     ('2014.1', 'icehouse'),
     ('2014.2', 'juno'),
     ('2015.1', 'kilo'),
+    ('2015.2', 'liberty'),
 ])
 
 # The ugly duckling
@@ -115,8 +117,37 @@
     ('2.2.0', 'juno'),
     ('2.2.1', 'kilo'),
     ('2.2.2', 'kilo'),
+    ('2.3.0', 'liberty'),
 ])
 
+# >= Liberty version->codename mapping
+PACKAGE_CODENAMES = {
+    'nova-common': OrderedDict([
+        ('12.0.0', 'liberty'),
+    ]),
+    'neutron-common': OrderedDict([
+        ('7.0.0', 'liberty'),
+    ]),
+    'cinder-common': OrderedDict([
+        ('7.0.0', 'liberty'),
+    ]),
+    'keystone': OrderedDict([
+        ('8.0.0', 'liberty'),
+    ]),
+    'horizon-common': OrderedDict([
+        ('8.0.0', 'liberty'),
+    ]),
+    'ceilometer-common': OrderedDict([
+        ('5.0.0', 'liberty'),
+    ]),
+    'heat-common': OrderedDict([
+        ('5.0.0', 'liberty'),
+    ]),
+    'glance-common': OrderedDict([
+        ('11.0.0', 'liberty'),
+    ]),
+}
+
 DEFAULT_LOOPBACK_SIZE = '5G'
 
 
@@ -200,20 +231,29 @@
         error_out(e)
 
     vers = apt.upstream_version(pkg.current_ver.ver_str)
+    match = re.match('^(\d)\.(\d)\.(\d)', vers)
+    if match:
+        vers = match.group(0)
 
-    try:
-        if 'swift' in pkg.name:
-            swift_vers = vers[:5]
-            if swift_vers not in SWIFT_CODENAMES:
-                # Deal with 1.10.0 upward
-                swift_vers = vers[:6]
-            return SWIFT_CODENAMES[swift_vers]
-        else:
-            vers = vers[:6]
-            return OPENSTACK_CODENAMES[vers]
-    except KeyError:
-        e = 'Could not determine OpenStack codename for version %s' % vers
-        error_out(e)
+    # >= Liberty independent project versions
+    if (package in PACKAGE_CODENAMES and
+            vers in PACKAGE_CODENAMES[package]):
+        return PACKAGE_CODENAMES[package][vers]
+    else:
+        # < Liberty co-ordinated project versions
+        try:
+            if 'swift' in pkg.name:
+                swift_vers = vers[:5]
+                if swift_vers not in SWIFT_CODENAMES:
+                    # Deal with 1.10.0 upward
+                    swift_vers = vers[:6]
+                return SWIFT_CODENAMES[swift_vers]
+            else:
+                vers = vers[:6]
+                return OPENSTACK_CODENAMES[vers]
+        except KeyError:
+            e = 'Could not determine OpenStack codename for version %s' % vers
+            error_out(e)
 
 
 def get_os_version_package(pkg, fatal=True):
@@ -323,6 +363,9 @@
             'kilo': 'trusty-updates/kilo',
             'kilo/updates': 'trusty-updates/kilo',
             'kilo/proposed': 'trusty-proposed/kilo',
+            'liberty': 'trusty-updates/liberty',
+            'liberty/updates': 'trusty-updates/liberty',
+            'liberty/proposed': 'trusty-proposed/liberty',
         }
 
         try:
@@ -518,6 +561,7 @@
     Clone/install all specified OpenStack repositories.
 
     The expected format of projects_yaml is:
+
         repositories:
           - {name: keystone,
              repository: 'git://git.openstack.org/openstack/keystone.git',
@@ -525,11 +569,13 @@
           - {name: requirements,
              repository: 'git://git.openstack.org/openstack/requirements.git',
              branch: 'stable/icehouse'}
+
         directory: /mnt/openstack-git
         http_proxy: squid-proxy-url
         https_proxy: squid-proxy-url
 
-        The directory, http_proxy, and https_proxy keys are optional.
+    The directory, http_proxy, and https_proxy keys are optional.
+
     """
     global requirements_dir
     parent_dir = '/mnt/openstack-git'
@@ -551,6 +597,12 @@
 
     pip_create_virtualenv(os.path.join(parent_dir, 'venv'))
 
+    # Upgrade setuptools and pip from default virtualenv versions. The default
+    # versions in trusty break master OpenStack branch deployments.
+    for p in ['pip', 'setuptools']:
+        pip_install(p, upgrade=True, proxy=http_proxy,
+                    venv=os.path.join(parent_dir, 'venv'))
+
     for p in projects['repositories']:
         repo = p['repository']
         branch = p['branch']
@@ -612,24 +664,24 @@
     else:
         repo_dir = dest_dir
 
+    venv = os.path.join(parent_dir, 'venv')
+
     if update_requirements:
         if not requirements_dir:
             error_out('requirements repo must be cloned before '
                       'updating from global requirements.')
-        _git_update_requirements(repo_dir, requirements_dir)
+        _git_update_requirements(venv, repo_dir, requirements_dir)
 
     juju_log('Installing git repo from dir: {}'.format(repo_dir))
     if http_proxy:
-        pip_install(repo_dir, proxy=http_proxy,
-                    venv=os.path.join(parent_dir, 'venv'))
+        pip_install(repo_dir, proxy=http_proxy, venv=venv)
     else:
-        pip_install(repo_dir,
-                    venv=os.path.join(parent_dir, 'venv'))
+        pip_install(repo_dir, venv=venv)
 
     return repo_dir
 
 
-def _git_update_requirements(package_dir, reqs_dir):
+def _git_update_requirements(venv, package_dir, reqs_dir):
     """
     Update from global requirements.
 
@@ -638,12 +690,14 @@
     """
     orig_dir = os.getcwd()
     os.chdir(reqs_dir)
-    cmd = ['python', 'update.py', package_dir]
+    python = os.path.join(venv, 'bin/python')
+    cmd = [python, 'update.py', package_dir]
     try:
         subprocess.check_call(cmd)
     except subprocess.CalledProcessError:
         package = os.path.basename(package_dir)
-        error_out("Error updating {} from global-requirements.txt".format(package))
+        error_out("Error updating {} from "
+                  "global-requirements.txt".format(package))
     os.chdir(orig_dir)
 
 
@@ -690,7 +744,6 @@
 
     return None
 
-
 def remote_restart(rel_name, remote_service=None):
     trigger = {
         'restart-trigger': str(uuid.uuid4()),
@@ -705,3 +758,4 @@
             relation_set(relation_id=rid,
                          relation_settings=trigger,
                          )
+                               

=== modified file 'hooks/charmhelpers/contrib/python/packages.py'
--- hooks/charmhelpers/contrib/python/packages.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/contrib/python/packages.py	2015-11-03 04:19:02 +0000
@@ -36,6 +36,8 @@
 def parse_options(given, available):
     """Given a set of options, check if available"""
     for key, value in sorted(given.items()):
+        if not value:
+            continue
         if key in available:
             yield "--{0}={1}".format(key, value)
 

=== modified file 'hooks/charmhelpers/contrib/storage/linux/ceph.py'
--- hooks/charmhelpers/contrib/storage/linux/ceph.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/contrib/storage/linux/ceph.py	2015-11-03 04:19:02 +0000
@@ -60,12 +60,12 @@
 KEYFILE = '/etc/ceph/ceph.client.{}.key'
 
 CEPH_CONF = """[global]
- auth supported = {auth}
- keyring = {keyring}
- mon host = {mon_hosts}
- log to syslog = {use_syslog}
- err to syslog = {use_syslog}
- clog to syslog = {use_syslog}
+auth supported = {auth}
+keyring = {keyring}
+mon host = {mon_hosts}
+log to syslog = {use_syslog}
+err to syslog = {use_syslog}
+clog to syslog = {use_syslog}
 """
 
 

=== modified file 'hooks/charmhelpers/contrib/storage/linux/utils.py'
--- hooks/charmhelpers/contrib/storage/linux/utils.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/contrib/storage/linux/utils.py	2015-11-03 04:19:02 +0000
@@ -43,9 +43,10 @@
 
     :param block_device: str: Full path of block device to clean.
     '''
+    # https://github.com/ceph/ceph/commit/fdd7f8d83afa25c4e09aaedd90ab93f3b64a677b
     # sometimes sgdisk exits non-zero; this is OK, dd will clean up
-    call(['sgdisk', '--zap-all', '--mbrtogpt',
-          '--clear', block_device])
+    call(['sgdisk', '--zap-all', '--', block_device])
+    call(['sgdisk', '--clear', '--mbrtogpt', '--', block_device])
     dev_end = check_output(['blockdev', '--getsz',
                             block_device]).decode('UTF-8')
     gpt_end = int(dev_end.split()[0]) - 100
@@ -67,4 +68,4 @@
     out = check_output(['mount']).decode('UTF-8')
     if is_partition:
         return bool(re.search(device + r"\b", out))
-    return bool(re.search(device + r"[0-9]+\b", out))
+    return bool(re.search(device + r"[0-9]*\b", out))

=== modified file 'hooks/charmhelpers/core/hookenv.py'
--- hooks/charmhelpers/core/hookenv.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/core/hookenv.py	2015-11-03 04:19:02 +0000
@@ -21,7 +21,10 @@
 #  Charm Helpers Developers <[e-mail]>
 
 from __future__ import print_function
+import copy
+from distutils.version import LooseVersion
 from functools import wraps
+import glob
 import os
 import json
 import yaml
@@ -71,6 +74,7 @@
         res = func(*args, **kwargs)
         cache[key] = res
         return res
+    wrapper._wrapped = func
     return wrapper
 
 
@@ -170,9 +174,19 @@
     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)
+@cached
+def relation_id(relation_name=None, service_or_unit=None):
+    """The relation ID for the current or a specified relation"""
+    if not relation_name and not service_or_unit:
+        return os.environ.get('JUJU_RELATION_ID', None)
+    elif relation_name and service_or_unit:
+        service_name = service_or_unit.split('/')[0]
+        for relid in relation_ids(relation_name):
+            remote_service = remote_service_name(relid)
+            if remote_service == service_name:
+                return relid
+    else:
+        raise ValueError('Must specify neither or both of relation_name and service_or_unit')
 
 
 def local_unit():
@@ -190,9 +204,20 @@
     return local_unit().split('/')[0]
 
 
+@cached
+def remote_service_name(relid=None):
+    """The remote service name for a given relation-id (or the current relation)"""
+    if relid is None:
+        unit = remote_unit()
+    else:
+        units = related_units(relid)
+        unit = units[0] if units else None
+    return unit.split('/')[0] if unit else None
+
+
 def hook_name():
     """The name of the currently executing hook"""
-    return os.path.basename(sys.argv[0])
+    return os.environ.get('JUJU_HOOK_NAME', os.path.basename(sys.argv[0]))
 
 
 class Config(dict):
@@ -242,29 +267,7 @@
         self.path = os.path.join(charm_dir(), Config.CONFIG_FILE_NAME)
         if os.path.exists(self.path):
             self.load_previous()
-
-    def __getitem__(self, key):
-        """For regular dict lookups, check the current juju config first,
-        then the previous (saved) copy. This ensures that user-saved values
-        will be returned by a dict lookup.
-
-        """
-        try:
-            return dict.__getitem__(self, key)
-        except KeyError:
-            return (self._prev_dict or {})[key]
-
-    def get(self, key, default=None):
-        try:
-            return self[key]
-        except KeyError:
-            return default
-
-    def keys(self):
-        prev_keys = []
-        if self._prev_dict is not None:
-            prev_keys = self._prev_dict.keys()
-        return list(set(prev_keys + list(dict.keys(self))))
+        atexit(self._implicit_save)
 
     def load_previous(self, path=None):
         """Load previous copy of config from disk.
@@ -283,6 +286,9 @@
         self.path = path or self.path
         with open(self.path) as f:
             self._prev_dict = json.load(f)
+        for k, v in copy.deepcopy(self._prev_dict).items():
+            if k not in self:
+                self[k] = v
 
     def changed(self, key):
         """Return True if the current value for this key is different from
@@ -314,13 +320,13 @@
         instance.
 
         """
-        if self._prev_dict:
-            for k, v in six.iteritems(self._prev_dict):
-                if k not in self:
-                    self[k] = v
         with open(self.path, 'w') as f:
             json.dump(self, f)
 
+    def _implicit_save(self):
+        if self.implicit_save:
+            self.save()
+
 
 @cached
 def config(scope=None):
@@ -485,6 +491,63 @@
 
 
 @cached
+def relation_to_interface(relation_name):
+    """
+    Given the name of a relation, return the interface that relation uses.
+
+    :returns: The interface name, or ``None``.
+    """
+    return relation_to_role_and_interface(relation_name)[1]
+
+
+@cached
+def relation_to_role_and_interface(relation_name):
+    """
+    Given the name of a relation, return the role and the name of the interface
+    that relation uses (where role is one of ``provides``, ``requires``, or ``peer``).
+
+    :returns: A tuple containing ``(role, interface)``, or ``(None, None)``.
+    """
+    _metadata = metadata()
+    for role in ('provides', 'requires', 'peer'):
+        interface = _metadata.get(role, {}).get(relation_name, {}).get('interface')
+        if interface:
+            return role, interface
+    return None, None
+
+
+@cached
+def role_and_interface_to_relations(role, interface_name):
+    """
+    Given a role and interface name, return a list of relation names for the
+    current charm that use that interface under that role (where role is one
+    of ``provides``, ``requires``, or ``peer``).
+
+    :returns: A list of relation names.
+    """
+    _metadata = metadata()
+    results = []
+    for relation_name, relation in _metadata.get(role, {}).items():
+        if relation['interface'] == interface_name:
+            results.append(relation_name)
+    return results
+
+
+@cached
+def interface_to_relations(interface_name):
+    """
+    Given an interface, return a list of relation names for the current
+    charm that use that interface.
+
+    :returns: A list of relation names.
+    """
+    results = []
+    for role in ('provides', 'requires', 'peer'):
+        results.extend(role_and_interface_to_relations(role, interface_name))
+    return results
+
+
+@cached
 def charm_name():
     """Get the name of the current charm as is specified on metadata.yaml"""
     return metadata().get('name')
@@ -587,10 +650,14 @@
             hooks.execute(sys.argv)
     """
 
-    def __init__(self, config_save=True):
+    def __init__(self, config_save=None):
         super(Hooks, self).__init__()
         self._hooks = {}
-        self._config_save = config_save
+
+        # For unknown reasons, we allow the Hooks constructor to override
+        # config().implicit_save.
+        if config_save is not None:
+            config().implicit_save = config_save
 
     def register(self, name, function):
         """Register a hook"""
@@ -598,13 +665,16 @@
 
     def execute(self, args):
         """Execute a registered hook based on args[0]"""
+        _run_atstart()
         hook_name = os.path.basename(args[0])
         if hook_name in self._hooks:
-            self._hooks[hook_name]()
-            if self._config_save:
-                cfg = config()
-                if cfg.implicit_save:
-                    cfg.save()
+            try:
+                self._hooks[hook_name]()
+            except SystemExit as x:
+                if x.code is None or x.code == 0:
+                    _run_atexit()
+                raise
+            _run_atexit()
         else:
             raise UnregisteredHookError(hook_name)
 
@@ -653,6 +723,21 @@
     subprocess.check_call(['action-fail', message])
 
 
+def action_name():
+    """Get the name of the currently executing action."""
+    return os.environ.get('JUJU_ACTION_NAME')
+
+
+def action_uuid():
+    """Get the UUID of the currently executing action."""
+    return os.environ.get('JUJU_ACTION_UUID')
+
+
+def action_tag():
+    """Get the tag for the currently executing action."""
+    return os.environ.get('JUJU_ACTION_TAG')
+
+
 def status_set(workload_state, message):
     """Set the workload state with a message
 
@@ -732,13 +817,80 @@
 @translate_exc(from_exc=OSError, to_exc=NotImplementedError)
 def leader_set(settings=None, **kwargs):
     """Juju leader set value(s)"""
-    log("Juju leader-set '%s'" % (settings), level=DEBUG)
+    # Don't log secrets.
+    # log("Juju leader-set '%s'" % (settings), level=DEBUG)
     cmd = ['leader-set']
     settings = settings or {}
     settings.update(kwargs)
-    for k, v in settings.iteritems():
+    for k, v in settings.items():
         if v is None:
             cmd.append('{}='.format(k))
         else:
             cmd.append('{}={}'.format(k, v))
     subprocess.check_call(cmd)
+
+
+@cached
+def juju_version():
+    """Full version string (eg. '1.23.3.1-trusty-amd64')"""
+    # Per https://bugs.launchpad.net/juju-core/+bug/1455368/comments/1
+    jujud = glob.glob('/var/lib/juju/tools/machine-*/jujud')[0]
+    return subprocess.check_output([jujud, 'version'],
+                                   universal_newlines=True).strip()
+
+
+@cached
+def has_juju_version(minimum_version):
+    """Return True if the Juju version is at least the provided version"""
+    return LooseVersion(juju_version()) >= LooseVersion(minimum_version)
+
+
+_atexit = []
+_atstart = []
+
+
+def atstart(callback, *args, **kwargs):
+    '''Schedule a callback to run before the main hook.
+
+    Callbacks are run in the order they were added.
+
+    This is useful for modules and classes to perform initialization
+    and inject behavior. In particular:
+
+        - Run common code before all of your hooks, such as logging
+          the hook name or interesting relation data.
+        - Defer object or module initialization that requires a hook
+          context until we know there actually is a hook context,
+          making testing easier.
+        - Rather than requiring charm authors to include boilerplate to
+          invoke your helper's behavior, have it run automatically if
+          your object is instantiated or module imported.
+
+    This is not at all useful after your hook framework as been launched.
+    '''
+    global _atstart
+    _atstart.append((callback, args, kwargs))
+
+
+def atexit(callback, *args, **kwargs):
+    '''Schedule a callback to run on successful hook completion.
+
+    Callbacks are run in the reverse order that they were added.'''
+    _atexit.append((callback, args, kwargs))
+
+
+def _run_atstart():
+    '''Hook frameworks must invoke this before running the main hook body.'''
+    global _atstart
+    for callback, args, kwargs in _atstart:
+        callback(*args, **kwargs)
+    del _atstart[:]
+
+
+def _run_atexit():
+    '''Hook frameworks must invoke this after the main hook body has
+    successfully completed. Do not invoke it if the hook fails.'''
+    global _atexit
+    for callback, args, kwargs in reversed(_atexit):
+        callback(*args, **kwargs)
+    del _atexit[:]

=== modified file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/core/host.py	2015-11-03 04:19:02 +0000
@@ -63,6 +63,36 @@
     return service_result
 
 
+def service_pause(service_name, init_dir=None):
+    """Pause a system service.
+
+    Stop it, and prevent it from starting again at boot."""
+    if init_dir is None:
+        init_dir = "/etc/init"
+    stopped = service_stop(service_name)
+    # XXX: Support systemd too
+    override_path = os.path.join(
+        init_dir, '{}.override'.format(service_name))
+    with open(override_path, 'w') as fh:
+        fh.write("manual\n")
+    return stopped
+
+
+def service_resume(service_name, init_dir=None):
+    """Resume a system service.
+
+    Reenable starting again at boot. Start the service"""
+    # XXX: Support systemd too
+    if init_dir is None:
+        init_dir = "/etc/init"
+    override_path = os.path.join(
+        init_dir, '{}.override'.format(service_name))
+    if os.path.exists(override_path):
+        os.unlink(override_path)
+    started = service_start(service_name)
+    return started
+
+
 def service(action, service_name):
     """Control a system service"""
     cmd = ['service', service_name, action]
@@ -120,7 +150,7 @@
 
 def user_exists(username):
     try:
-        user_info = pwd.getpwnam(username)
+        pwd.getpwnam(username)
         user_exists = True
     except KeyError:
         user_exists = False
@@ -149,11 +179,7 @@
 
 def add_user_to_group(username, group):
     """Add a user to a group"""
-    cmd = [
-        'gpasswd', '-a',
-        username,
-        group
-    ]
+    cmd = ['gpasswd', '-a', username, group]
     log("Adding user {} to group {}".format(username, group))
     subprocess.check_call(cmd)
 
@@ -263,7 +289,6 @@
     return system_mounts
 
 
-
 def fstab_mount(mountpoint):
     cmd_args = ['mount', mountpoint]
     try:

=== modified file 'hooks/charmhelpers/core/hugepage.py'
--- hooks/charmhelpers/core/hugepage.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/core/hugepage.py	2015-11-03 04:19:02 +0000
@@ -1,4 +1,3 @@
-
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
@@ -19,10 +18,8 @@
 # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
 
 import yaml
-from charmhelpers.core.fstab import Fstab
-from charmhelpers.core.sysctl import (
-    create,
-)
+from charmhelpers.core import fstab
+from charmhelpers.core import sysctl
 from charmhelpers.core.host import (
     add_group,
     add_user_to_group,
@@ -30,8 +27,9 @@
     mkdir,
 )
 
+
 def hugepage_support(user, group='hugetlb', nr_hugepages=256,
-                     max_map_count=65536, mnt_point='/hugepages',
+                     max_map_count=65536, mnt_point='/run/hugepages/kvm',
                      pagesize='2MB', mount=True):
     group_info = add_group(group)
     gid = group_info.gr_gid
@@ -41,14 +39,14 @@
         'vm.max_map_count': max_map_count,  # 1GB
         'vm.hugetlb_shm_group': gid,
     }
-    create(yaml.dump(sysctl_settings), '/etc/sysctl.d/10-hugepage.conf')
+    sysctl.create(yaml.dump(sysctl_settings), '/etc/sysctl.d/10-hugepage.conf')
     mkdir(mnt_point, owner='root', group='root', perms=0o755, force=False)
-    fstab = Fstab()
-    fstab_entry = fstab.get_entry_by_attr('mountpoint', mnt_point)
+    lfstab = fstab.Fstab()
+    fstab_entry = lfstab.get_entry_by_attr('mountpoint', mnt_point)
     if fstab_entry:
-        fstab.remove_entry(fstab_entry)
-    entry = fstab.Entry('nodev', mnt_point, 'hugetlbfs',
-                        'mode=1770,gid={},pagesize={}'.format(gid, pagesize), 0, 0)
-    fstab.add_entry(entry)
+        lfstab.remove_entry(fstab_entry)
+    entry = lfstab.Entry('nodev', mnt_point, 'hugetlbfs',
+                         'mode=1770,gid={},pagesize={}'.format(gid, pagesize), 0, 0)
+    lfstab.add_entry(entry)
     if mount:
         fstab_mount(mnt_point)

=== modified file 'hooks/charmhelpers/core/services/base.py'
--- hooks/charmhelpers/core/services/base.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/core/services/base.py	2015-11-03 04:19:02 +0000
@@ -128,15 +128,18 @@
         """
         Handle the current hook by doing The Right Thing with the registered services.
         """
-        hook_name = hookenv.hook_name()
-        if hook_name == 'stop':
-            self.stop_services()
-        else:
-            self.reconfigure_services()
-            self.provide_data()
-        cfg = hookenv.config()
-        if cfg.implicit_save:
-            cfg.save()
+        hookenv._run_atstart()
+        try:
+            hook_name = hookenv.hook_name()
+            if hook_name == 'stop':
+                self.stop_services()
+            else:
+                self.reconfigure_services()
+                self.provide_data()
+        except SystemExit as x:
+            if x.code is None or x.code == 0:
+                hookenv._run_atexit()
+        hookenv._run_atexit()
 
     def provide_data(self):
         """

=== modified file 'hooks/charmhelpers/core/unitdata.py'
--- hooks/charmhelpers/core/unitdata.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/core/unitdata.py	2015-11-03 04:19:02 +0000
@@ -152,6 +152,7 @@
 import collections
 import contextlib
 import datetime
+import itertools
 import json
 import os
 import pprint
@@ -164,8 +165,7 @@
 class Storage(object):
     """Simple key value database for local unit state within charms.
 
-    Modifications are automatically committed at hook exit. That's
-    currently regardless of exit code.
+    Modifications are not persisted unless :meth:`flush` is called.
 
     To support dicts, lists, integer, floats, and booleans values
     are automatically json encoded/decoded.
@@ -173,8 +173,11 @@
     def __init__(self, path=None):
         self.db_path = path
         if path is None:
-            self.db_path = os.path.join(
-                os.environ.get('CHARM_DIR', ''), '.unit-state.db')
+            if 'UNIT_STATE_DB' in os.environ:
+                self.db_path = os.environ['UNIT_STATE_DB']
+            else:
+                self.db_path = os.path.join(
+                    os.environ.get('CHARM_DIR', ''), '.unit-state.db')
         self.conn = sqlite3.connect('%s' % self.db_path)
         self.cursor = self.conn.cursor()
         self.revision = None
@@ -189,15 +192,8 @@
         self.conn.close()
         self._closed = True
 
-    def _scoped_query(self, stmt, params=None):
-        if params is None:
-            params = []
-        return stmt, params
-
     def get(self, key, default=None, record=False):
-        self.cursor.execute(
-            *self._scoped_query(
-                'select data from kv where key=?', [key]))
+        self.cursor.execute('select data from kv where key=?', [key])
         result = self.cursor.fetchone()
         if not result:
             return default
@@ -206,33 +202,81 @@
         return json.loads(result[0])
 
     def getrange(self, key_prefix, strip=False):
-        stmt = "select key, data from kv where key like '%s%%'" % key_prefix
-        self.cursor.execute(*self._scoped_query(stmt))
+        """
+        Get a range of keys starting with a common prefix as a mapping of
+        keys to values.
+
+        :param str key_prefix: Common prefix among all keys
+        :param bool strip: Optionally strip the common prefix from the key
+            names in the returned dict
+        :return dict: A (possibly empty) dict of key-value mappings
+        """
+        self.cursor.execute("select key, data from kv where key like ?",
+                            ['%s%%' % key_prefix])
         result = self.cursor.fetchall()
 
         if not result:
-            return None
+            return {}
         if not strip:
             key_prefix = ''
         return dict([
             (k[len(key_prefix):], json.loads(v)) for k, v in result])
 
     def update(self, mapping, prefix=""):
+        """
+        Set the values of multiple keys at once.
+
+        :param dict mapping: Mapping of keys to values
+        :param str prefix: Optional prefix to apply to all keys in `mapping`
+            before setting
+        """
         for k, v in mapping.items():
             self.set("%s%s" % (prefix, k), v)
 
     def unset(self, key):
+        """
+        Remove a key from the database entirely.
+        """
         self.cursor.execute('delete from kv where key=?', [key])
         if self.revision and self.cursor.rowcount:
             self.cursor.execute(
                 'insert into kv_revisions values (?, ?, ?)',
                 [key, self.revision, json.dumps('DELETED')])
 
+    def unsetrange(self, keys=None, prefix=""):
+        """
+        Remove a range of keys starting with a common prefix, from the database
+        entirely.
+
+        :param list keys: List of keys to remove.
+        :param str prefix: Optional prefix to apply to all keys in ``keys``
+            before removing.
+        """
+        if keys is not None:
+            keys = ['%s%s' % (prefix, key) for key in keys]
+            self.cursor.execute('delete from kv where key in (%s)' % ','.join(['?'] * len(keys)), keys)
+            if self.revision and self.cursor.rowcount:
+                self.cursor.execute(
+                    'insert into kv_revisions values %s' % ','.join(['(?, ?, ?)'] * len(keys)),
+                    list(itertools.chain.from_iterable((key, self.revision, json.dumps('DELETED')) for key in keys)))
+        else:
+            self.cursor.execute('delete from kv where key like ?',
+                                ['%s%%' % prefix])
+            if self.revision and self.cursor.rowcount:
+                self.cursor.execute(
+                    'insert into kv_revisions values (?, ?, ?)',
+                    ['%s%%' % prefix, self.revision, json.dumps('DELETED')])
+
     def set(self, key, value):
+        """
+        Set a value in the database.
+
+        :param str key: Key to set the value for
+        :param value: Any JSON-serializable value to be set
+        """
         serialized = json.dumps(value)
 
-        self.cursor.execute(
-            'select data from kv where key=?', [key])
+        self.cursor.execute('select data from kv where key=?', [key])
         exists = self.cursor.fetchone()
 
         # Skip mutations to the same value

=== modified file 'hooks/charmhelpers/fetch/__init__.py'
--- hooks/charmhelpers/fetch/__init__.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/fetch/__init__.py	2015-11-03 04:19:02 +0000
@@ -90,6 +90,14 @@
     'kilo/proposed': 'trusty-proposed/kilo',
     'trusty-kilo/proposed': 'trusty-proposed/kilo',
     'trusty-proposed/kilo': 'trusty-proposed/kilo',
+    # Liberty
+    'liberty': 'trusty-updates/liberty',
+    'trusty-liberty': 'trusty-updates/liberty',
+    'trusty-liberty/updates': 'trusty-updates/liberty',
+    'trusty-updates/liberty': 'trusty-updates/liberty',
+    'liberty/proposed': 'trusty-proposed/liberty',
+    'trusty-liberty/proposed': 'trusty-proposed/liberty',
+    'trusty-proposed/liberty': 'trusty-proposed/liberty',
 }
 
 # The order of this list is very important. Handlers should be listed in from
@@ -215,19 +223,27 @@
     _run_apt_command(cmd, fatal)
 
 
+def apt_mark(packages, mark, fatal=False):
+    """Flag one or more packages using apt-mark"""
+    cmd = ['apt-mark', mark]
+    if isinstance(packages, six.string_types):
+        cmd.append(packages)
+    else:
+        cmd.extend(packages)
+    log("Holding {}".format(packages))
+
+    if fatal:
+        subprocess.check_call(cmd, universal_newlines=True)
+    else:
+        subprocess.call(cmd, universal_newlines=True)
+
+
 def apt_hold(packages, fatal=False):
-    """Hold one or more packages"""
-    cmd = ['apt-mark', 'hold']
-    if isinstance(packages, six.string_types):
-        cmd.append(packages)
-    else:
-        cmd.extend(packages)
-    log("Holding {}".format(packages))
-
-    if fatal:
-        subprocess.check_call(cmd)
-    else:
-        subprocess.call(cmd)
+    return apt_mark(packages, 'hold', fatal=fatal)
+
+
+def apt_unhold(packages, fatal=False):
+    return apt_mark(packages, 'unhold', fatal=fatal)
 
 
 def add_source(source, key=None):
@@ -370,8 +386,9 @@
     for handler in handlers:
         try:
             installed_to = handler.install(source, *args, **kwargs)
-        except UnhandledSource:
-            pass
+        except UnhandledSource as e:
+            log('Install source attempt unsuccessful: {}'.format(e),
+                level='WARNING')
     if not installed_to:
         raise UnhandledSource("No handler found for source {}".format(source))
     return installed_to

=== modified file 'hooks/charmhelpers/fetch/archiveurl.py'
--- hooks/charmhelpers/fetch/archiveurl.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/fetch/archiveurl.py	2015-11-03 04:19:02 +0000
@@ -77,6 +77,8 @@
     def can_handle(self, source):
         url_parts = self.parse_url(source)
         if url_parts.scheme not in ('http', 'https', 'ftp', 'file'):
+            # XXX: Why is this returning a boolean and a string? It's
+            # doomed to fail since "bool(can_handle('foo://'))"  will be True.
             return "Wrong source type"
         if get_archive_handler(self.base_url(source)):
             return True
@@ -155,7 +157,11 @@
             else:
                 algorithms = hashlib.algorithms_available
             if key in algorithms:
-                check_hash(dld_file, value, key)
+                if len(value) != 1:
+                    raise TypeError(
+                        "Expected 1 hash value, not %d" % len(value))
+                expected = value[0]
+                check_hash(dld_file, expected, key)
         if checksum:
             check_hash(dld_file, checksum, hash_type)
         return extract(dld_file, dest)

=== modified file 'hooks/charmhelpers/fetch/giturl.py'
--- hooks/charmhelpers/fetch/giturl.py	2015-06-24 12:22:08 +0000
+++ hooks/charmhelpers/fetch/giturl.py	2015-11-03 04:19:02 +0000
@@ -67,7 +67,7 @@
         try:
             self.clone(source, dest_dir, branch, depth)
         except GitCommandError as e:
-            raise UnhandledSource(e.message)
+            raise UnhandledSource(e)
         except OSError as e:
             raise UnhandledSource(e.strerror)
         return dest_dir

=== added file 'vpp.patch'
--- vpp.patch	1970-01-01 00:00:00 +0000
+++ vpp.patch	2015-11-03 04:19:02 +0000
@@ -0,0 +1,1832 @@
+=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/deployment.py'
+--- hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/contrib/openstack/amulet/deployment.py	2015-10-30 01:28:39 +0000
+@@ -44,7 +44,7 @@
+            Determine if the local branch being tested is derived from its
+            stable or next (dev) branch, and based on this, use the corresonding
+            stable or next branches for the other_services."""
+-        base_charms = ['mysql', 'mongodb']
++        base_charms = ['mysql', 'mongodb', 'nrpe']
+ 
+         if self.series in ['precise', 'trusty']:
+             base_series = self.series
+@@ -83,9 +83,10 @@
+         services.append(this_service)
+         use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
+                       'ceph-osd', 'ceph-radosgw']
+-        # Openstack subordinate charms do not expose an origin option as that
+-        # is controlled by the principle
+-        ignore = ['neutron-openvswitch', 'cisco-vpp']
++        # Most OpenStack subordinate charms do not expose an origin option
++        # as that is controlled by the principle.
++        ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
++                  'cisco-vpp', 'odl-controller']
+ 
+         if self.openstack:
+             for svc in services:
+@@ -152,3 +153,36 @@
+             return os_origin.split('%s-' % self.series)[1].split('/')[0]
+         else:
+             return releases[self.series]
++
++    def get_ceph_expected_pools(self, radosgw=False):
++        """Return a list of expected ceph pools in a ceph + cinder + glance
++        test scenario, based on OpenStack release and whether ceph radosgw
++        is flagged as present or not."""
++
++        if self._get_openstack_release() >= self.trusty_kilo:
++            # Kilo or later
++            pools = [
++                'rbd',
++                'cinder',
++                'glance'
++            ]
++        else:
++            # Juno or earlier
++            pools = [
++                'data',
++                'metadata',
++                'rbd',
++                'cinder',
++                'glance'
++            ]
++
++        if radosgw:
++            pools.extend([
++                '.rgw.root',
++                '.rgw.control',
++                '.rgw',
++                '.rgw.gc',
++                '.users.uid'
++            ])
++
++        return pools
+
+=== modified file 'hooks/charmhelpers/contrib/openstack/amulet/utils.py'
+--- hooks/charmhelpers/contrib/openstack/amulet/utils.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/contrib/openstack/amulet/utils.py	2015-10-30 01:28:39 +0000
+@@ -14,16 +14,20 @@
+ # You should have received a copy of the GNU Lesser General Public License
+ # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
+ 
++import amulet
++import json
+ import logging
+ import os
++import six
+ import time
+ import urllib
+ 
++import cinderclient.v1.client as cinder_client
+ import glanceclient.v1.client as glance_client
++import heatclient.v1.client as heat_client
+ import keystoneclient.v2_0 as keystone_client
+ import novaclient.v1_1.client as nova_client
+-
+-import six
++import swiftclient
+ 
+ from charmhelpers.contrib.amulet.utils import (
+     AmuletUtils
+@@ -37,7 +41,7 @@
+     """OpenStack amulet utilities.
+ 
+        This class inherits from AmuletUtils and has additional support
+-       that is specifically for use by OpenStack charms.
++       that is specifically for use by OpenStack charm tests.
+        """
+ 
+     def __init__(self, log_level=ERROR):
+@@ -51,6 +55,8 @@
+            Validate actual endpoint data vs expected endpoint data. The ports
+            are used to find the matching endpoint.
+            """
++        self.log.debug('Validating endpoint data...')
++        self.log.debug('actual: {}'.format(repr(endpoints)))
+         found = False
+         for ep in endpoints:
+             self.log.debug('endpoint: {}'.format(repr(ep)))
+@@ -77,6 +83,7 @@
+            Validate a list of actual service catalog endpoints vs a list of
+            expected service catalog endpoints.
+            """
++        self.log.debug('Validating service catalog endpoint data...')
+         self.log.debug('actual: {}'.format(repr(actual)))
+         for k, v in six.iteritems(expected):
+             if k in actual:
+@@ -93,6 +100,7 @@
+            Validate a list of actual tenant data vs list of expected tenant
+            data.
+            """
++        self.log.debug('Validating tenant data...')
+         self.log.debug('actual: {}'.format(repr(actual)))
+         for e in expected:
+             found = False
+@@ -114,6 +122,7 @@
+            Validate a list of actual role data vs a list of expected role
+            data.
+            """
++        self.log.debug('Validating role data...')
+         self.log.debug('actual: {}'.format(repr(actual)))
+         for e in expected:
+             found = False
+@@ -134,6 +143,7 @@
+            Validate a list of actual user data vs a list of expected user
+            data.
+            """
++        self.log.debug('Validating user data...')
+         self.log.debug('actual: {}'.format(repr(actual)))
+         for e in expected:
+             found = False
+@@ -155,17 +165,30 @@
+ 
+            Validate a list of actual flavors vs a list of expected flavors.
+            """
++        self.log.debug('Validating flavor data...')
+         self.log.debug('actual: {}'.format(repr(actual)))
+         act = [a.name for a in actual]
+         return self._validate_list_data(expected, act)
+ 
+     def tenant_exists(self, keystone, tenant):
+         """Return True if tenant exists."""
++        self.log.debug('Checking if tenant exists ({})...'.format(tenant))
+         return tenant in [t.name for t in keystone.tenants.list()]
+ 
++    def authenticate_cinder_admin(self, keystone_sentry, username,
++                                  password, tenant):
++        """Authenticates admin user with cinder."""
++        # NOTE(beisner): cinder python client doesn't accept tokens.
++        service_ip = \
++            keystone_sentry.relation('shared-db',
++                                     'mysql:shared-db')['private-address']
++        ept = "http://{}:5000/v2.0".format(service_ip.strip().decode('utf-8'))
++        return cinder_client.Client(username, password, tenant, ept)
++
+     def authenticate_keystone_admin(self, keystone_sentry, user, password,
+                                     tenant):
+         """Authenticates admin user with the keystone admin endpoint."""
++        self.log.debug('Authenticating keystone admin...')
+         unit = keystone_sentry
+         service_ip = unit.relation('shared-db',
+                                    'mysql:shared-db')['private-address']
+@@ -175,6 +198,7 @@
+ 
+     def authenticate_keystone_user(self, keystone, user, password, tenant):
+         """Authenticates a regular user with the keystone public endpoint."""
++        self.log.debug('Authenticating keystone user ({})...'.format(user))
+         ep = keystone.service_catalog.url_for(service_type='identity',
+                                               endpoint_type='publicURL')
+         return keystone_client.Client(username=user, password=password,
+@@ -182,19 +206,49 @@
+ 
+     def authenticate_glance_admin(self, keystone):
+         """Authenticates admin user with glance."""
++        self.log.debug('Authenticating glance admin...')
+         ep = keystone.service_catalog.url_for(service_type='image',
+                                               endpoint_type='adminURL')
+         return glance_client.Client(ep, token=keystone.auth_token)
+ 
++    def authenticate_heat_admin(self, keystone):
++        """Authenticates the admin user with heat."""
++        self.log.debug('Authenticating heat admin...')
++        ep = keystone.service_catalog.url_for(service_type='orchestration',
++                                              endpoint_type='publicURL')
++        return heat_client.Client(endpoint=ep, token=keystone.auth_token)
++
+     def authenticate_nova_user(self, keystone, user, password, tenant):
+         """Authenticates a regular user with nova-api."""
++        self.log.debug('Authenticating nova user ({})...'.format(user))
+         ep = keystone.service_catalog.url_for(service_type='identity',
+                                               endpoint_type='publicURL')
+         return nova_client.Client(username=user, api_key=password,
+                                   project_id=tenant, auth_url=ep)
+ 
++    def authenticate_swift_user(self, keystone, user, password, tenant):
++        """Authenticates a regular user with swift api."""
++        self.log.debug('Authenticating swift user ({})...'.format(user))
++        ep = keystone.service_catalog.url_for(service_type='identity',
++                                              endpoint_type='publicURL')
++        return swiftclient.Connection(authurl=ep,
++                                      user=user,
++                                      key=password,
++                                      tenant_name=tenant,
++                                      auth_version='2.0')
++
+     def create_cirros_image(self, glance, image_name):
+-        """Download the latest cirros image and upload it to glance."""
++        """Download the latest cirros image and upload it to glance,
++        validate and return a resource pointer.
++
++        :param glance: pointer to authenticated glance connection
++        :param image_name: display name for new image
++        :returns: glance image pointer
++        """
++        self.log.debug('Creating glance cirros image '
++                       '({})...'.format(image_name))
++
++        # Download cirros image
+         http_proxy = os.getenv('AMULET_HTTP_PROXY')
+         self.log.debug('AMULET_HTTP_PROXY: {}'.format(http_proxy))
+         if http_proxy:
+@@ -203,57 +257,67 @@
+         else:
+             opener = urllib.FancyURLopener()
+ 
+-        f = opener.open("http://download.cirros-cloud.net/version/released")
++        f = opener.open('http://download.cirros-cloud.net/version/released')
+         version = f.read().strip()
+-        cirros_img = "cirros-{}-x86_64-disk.img".format(version)
++        cirros_img = 'cirros-{}-x86_64-disk.img'.format(version)
+         local_path = os.path.join('tests', cirros_img)
+ 
+         if not os.path.exists(local_path):
+-            cirros_url = "http://{}/{}/{}".format("download.cirros-cloud.net",
++            cirros_url = 'http://{}/{}/{}'.format('download.cirros-cloud.net',
+                                                   version, cirros_img)
+             opener.retrieve(cirros_url, local_path)
+         f.close()
+ 
++        # Create glance image
+         with open(local_path) as f:
+             image = glance.images.create(name=image_name, is_public=True,
+                                          disk_format='qcow2',
+                                          container_format='bare', data=f)
+-        count = 1
+-        status = image.status
+-        while status != 'active' and count < 10:
+-            time.sleep(3)
+-            image = glance.images.get(image.id)
+-            status = image.status
+-            self.log.debug('image status: {}'.format(status))
+-            count += 1
+-
+-        if status != 'active':
+-            self.log.error('image creation timed out')
+-            return None
++
++        # Wait for image to reach active status
++        img_id = image.id
++        ret = self.resource_reaches_status(glance.images, img_id,
++                                           expected_stat='active',
++                                           msg='Image status wait')
++        if not ret:
++            msg = 'Glance image failed to reach expected state.'
++            amulet.raise_status(amulet.FAIL, msg=msg)
++
++        # Re-validate new image
++        self.log.debug('Validating image attributes...')
++        val_img_name = glance.images.get(img_id).name
++        val_img_stat = glance.images.get(img_id).status
++        val_img_pub = glance.images.get(img_id).is_public
++        val_img_cfmt = glance.images.get(img_id).container_format
++        val_img_dfmt = glance.images.get(img_id).disk_format
++        msg_attr = ('Image attributes - name:{} public:{} id:{} stat:{} '
++                    'container fmt:{} disk fmt:{}'.format(
++                        val_img_name, val_img_pub, img_id,
++                        val_img_stat, val_img_cfmt, val_img_dfmt))
++
++        if val_img_name == image_name and val_img_stat == 'active' \
++                and val_img_pub is True and val_img_cfmt == 'bare' \
++                and val_img_dfmt == 'qcow2':
++            self.log.debug(msg_attr)
++        else:
++            msg = ('Volume validation failed, {}'.format(msg_attr))
++            amulet.raise_status(amulet.FAIL, msg=msg)
+ 
+         return image
+ 
+     def delete_image(self, glance, image):
+         """Delete the specified image."""
+-        num_before = len(list(glance.images.list()))
+-        glance.images.delete(image)
+-
+-        count = 1
+-        num_after = len(list(glance.images.list()))
+-        while num_after != (num_before - 1) and count < 10:
+-            time.sleep(3)
+-            num_after = len(list(glance.images.list()))
+-            self.log.debug('number of images: {}'.format(num_after))
+-            count += 1
+-
+-        if num_after != (num_before - 1):
+-            self.log.error('image deletion timed out')
+-            return False
+-
+-        return True
++
++        # /!\ DEPRECATION WARNING
++        self.log.warn('/!\\ DEPRECATION WARNING:  use '
++                      'delete_resource instead of delete_image.')
++        self.log.debug('Deleting glance image ({})...'.format(image))
++        return self.delete_resource(glance.images, image, msg='glance image')
+ 
+     def create_instance(self, nova, image_name, instance_name, flavor):
+         """Create the specified instance."""
++        self.log.debug('Creating instance '
++                       '({}|{}|{})'.format(instance_name, image_name, flavor))
+         image = nova.images.find(name=image_name)
+         flavor = nova.flavors.find(name=flavor)
+         instance = nova.servers.create(name=instance_name, image=image,
+@@ -276,19 +340,265 @@
+ 
+     def delete_instance(self, nova, instance):
+         """Delete the specified instance."""
+-        num_before = len(list(nova.servers.list()))
+-        nova.servers.delete(instance)
+-
+-        count = 1
+-        num_after = len(list(nova.servers.list()))
+-        while num_after != (num_before - 1) and count < 10:
+-            time.sleep(3)
+-            num_after = len(list(nova.servers.list()))
+-            self.log.debug('number of instances: {}'.format(num_after))
+-            count += 1
+-
+-        if num_after != (num_before - 1):
+-            self.log.error('instance deletion timed out')
+-            return False
+-
+-        return True
++
++        # /!\ DEPRECATION WARNING
++        self.log.warn('/!\\ DEPRECATION WARNING:  use '
++                      'delete_resource instead of delete_instance.')
++        self.log.debug('Deleting instance ({})...'.format(instance))
++        return self.delete_resource(nova.servers, instance,
++                                    msg='nova instance')
++
++    def create_or_get_keypair(self, nova, keypair_name="testkey"):
++        """Create a new keypair, or return pointer if it already exists."""
++        try:
++            _keypair = nova.keypairs.get(keypair_name)
++            self.log.debug('Keypair ({}) already exists, '
++                           'using it.'.format(keypair_name))
++            return _keypair
++        except:
++            self.log.debug('Keypair ({}) does not exist, '
++                           'creating it.'.format(keypair_name))
++
++        _keypair = nova.keypairs.create(name=keypair_name)
++        return _keypair
++
++    def create_cinder_volume(self, cinder, vol_name="demo-vol", vol_size=1,
++                             img_id=None, src_vol_id=None, snap_id=None):
++        """Create cinder volume, optionally from a glance image, OR
++        optionally as a clone of an existing volume, OR optionally
++        from a snapshot.  Wait for the new volume status to reach
++        the expected status, validate and return a resource pointer.
++
++        :param vol_name: cinder volume display name
++        :param vol_size: size in gigabytes
++        :param img_id: optional glance image id
++        :param src_vol_id: optional source volume id to clone
++        :param snap_id: optional snapshot id to use
++        :returns: cinder volume pointer
++        """
++        # Handle parameter input and avoid impossible combinations
++        if img_id and not src_vol_id and not snap_id:
++            # Create volume from image
++            self.log.debug('Creating cinder volume from glance image...')
++            bootable = 'true'
++        elif src_vol_id and not img_id and not snap_id:
++            # Clone an existing volume
++            self.log.debug('Cloning cinder volume...')
++            bootable = cinder.volumes.get(src_vol_id).bootable
++        elif snap_id and not src_vol_id and not img_id:
++            # Create volume from snapshot
++            self.log.debug('Creating cinder volume from snapshot...')
++            snap = cinder.volume_snapshots.find(id=snap_id)
++            vol_size = snap.size
++            snap_vol_id = cinder.volume_snapshots.get(snap_id).volume_id
++            bootable = cinder.volumes.get(snap_vol_id).bootable
++        elif not img_id and not src_vol_id and not snap_id:
++            # Create volume
++            self.log.debug('Creating cinder volume...')
++            bootable = 'false'
++        else:
++            # Impossible combination of parameters
++            msg = ('Invalid method use - name:{} size:{} img_id:{} '
++                   'src_vol_id:{} snap_id:{}'.format(vol_name, vol_size,
++                                                     img_id, src_vol_id,
++                                                     snap_id))
++            amulet.raise_status(amulet.FAIL, msg=msg)
++
++        # Create new volume
++        try:
++            vol_new = cinder.volumes.create(display_name=vol_name,
++                                            imageRef=img_id,
++                                            size=vol_size,
++                                            source_volid=src_vol_id,
++                                            snapshot_id=snap_id)
++            vol_id = vol_new.id
++        except Exception as e:
++            msg = 'Failed to create volume: {}'.format(e)
++            amulet.raise_status(amulet.FAIL, msg=msg)
++
++        # Wait for volume to reach available status
++        ret = self.resource_reaches_status(cinder.volumes, vol_id,
++                                           expected_stat="available",
++                                           msg="Volume status wait")
++        if not ret:
++            msg = 'Cinder volume failed to reach expected state.'
++            amulet.raise_status(amulet.FAIL, msg=msg)
++
++        # Re-validate new volume
++        self.log.debug('Validating volume attributes...')
++        val_vol_name = cinder.volumes.get(vol_id).display_name
++        val_vol_boot = cinder.volumes.get(vol_id).bootable
++        val_vol_stat = cinder.volumes.get(vol_id).status
++        val_vol_size = cinder.volumes.get(vol_id).size
++        msg_attr = ('Volume attributes - name:{} id:{} stat:{} boot:'
++                    '{} size:{}'.format(val_vol_name, vol_id,
++                                        val_vol_stat, val_vol_boot,
++                                        val_vol_size))
++
++        if val_vol_boot == bootable and val_vol_stat == 'available' \
++                and val_vol_name == vol_name and val_vol_size == vol_size:
++            self.log.debug(msg_attr)
++        else:
++            msg = ('Volume validation failed, {}'.format(msg_attr))
++            amulet.raise_status(amulet.FAIL, msg=msg)
++
++        return vol_new
++
++    def delete_resource(self, resource, resource_id,
++                        msg="resource", max_wait=120):
++        """Delete one openstack resource, such as one instance, keypair,
++        image, volume, stack, etc., and confirm deletion within max wait time.
++
++        :param resource: pointer to os resource type, ex:glance_client.images
++        :param resource_id: unique name or id for the openstack resource
++        :param msg: text to identify purpose in logging
++        :param max_wait: maximum wait time in seconds
++        :returns: True if successful, otherwise False
++        """
++        self.log.debug('Deleting OpenStack resource '
++                       '{} ({})'.format(resource_id, msg))
++        num_before = len(list(resource.list()))
++        resource.delete(resource_id)
++
++        tries = 0
++        num_after = len(list(resource.list()))
++        while num_after != (num_before - 1) and tries < (max_wait / 4):
++            self.log.debug('{} delete check: '
++                           '{} [{}:{}] {}'.format(msg, tries,
++                                                  num_before,
++                                                  num_after,
++                                                  resource_id))
++            time.sleep(4)
++            num_after = len(list(resource.list()))
++            tries += 1
++
++        self.log.debug('{}:  expected, actual count = {}, '
++                       '{}'.format(msg, num_before - 1, num_after))
++
++        if num_after == (num_before - 1):
++            return True
++        else:
++            self.log.error('{} delete timed out'.format(msg))
++            return False
++
++    def resource_reaches_status(self, resource, resource_id,
++                                expected_stat='available',
++                                msg='resource', max_wait=120):
++        """Wait for an openstack resources status to reach an
++           expected status within a specified time.  Useful to confirm that
++           nova instances, cinder vols, snapshots, glance images, heat stacks
++           and other resources eventually reach the expected status.
++
++        :param resource: pointer to os resource type, ex: heat_client.stacks
++        :param resource_id: unique id for the openstack resource
++        :param expected_stat: status to expect resource to reach
++        :param msg: text to identify purpose in logging
++        :param max_wait: maximum wait time in seconds
++        :returns: True if successful, False if status is not reached
++        """
++
++        tries = 0
++        resource_stat = resource.get(resource_id).status
++        while resource_stat != expected_stat and tries < (max_wait / 4):
++            self.log.debug('{} status check: '
++                           '{} [{}:{}] {}'.format(msg, tries,
++                                                  resource_stat,
++                                                  expected_stat,
++                                                  resource_id))
++            time.sleep(4)
++            resource_stat = resource.get(resource_id).status
++            tries += 1
++
++        self.log.debug('{}:  expected, actual status = {}, '
++                       '{}'.format(msg, resource_stat, expected_stat))
++
++        if resource_stat == expected_stat:
++            return True
++        else:
++            self.log.debug('{} never reached expected status: '
++                           '{}'.format(resource_id, expected_stat))
++            return False
++
++    def get_ceph_osd_id_cmd(self, index):
++        """Produce a shell command that will return a ceph-osd id."""
++        return ("`initctl list | grep 'ceph-osd ' | "
++                "awk 'NR=={} {{ print $2 }}' | "
++                "grep -o '[0-9]*'`".format(index + 1))
++
++    def get_ceph_pools(self, sentry_unit):
++        """Return a dict of ceph pools from a single ceph unit, with
++        pool name as keys, pool id as vals."""
++        pools = {}
++        cmd = 'sudo ceph osd lspools'
++        output, code = sentry_unit.run(cmd)
++        if code != 0:
++            msg = ('{} `{}` returned {} '
++                   '{}'.format(sentry_unit.info['unit_name'],
++                               cmd, code, output))
++            amulet.raise_status(amulet.FAIL, msg=msg)
++
++        # Example output: 0 data,1 metadata,2 rbd,3 cinder,4 glance,
++        for pool in str(output).split(','):
++            pool_id_name = pool.split(' ')
++            if len(pool_id_name) == 2:
++                pool_id = pool_id_name[0]
++                pool_name = pool_id_name[1]
++                pools[pool_name] = int(pool_id)
++
++        self.log.debug('Pools on {}: {}'.format(sentry_unit.info['unit_name'],
++                                                pools))
++        return pools
++
++    def get_ceph_df(self, sentry_unit):
++        """Return dict of ceph df json output, including ceph pool state.
++
++        :param sentry_unit: Pointer to amulet sentry instance (juju unit)
++        :returns: Dict of ceph df output
++        """
++        cmd = 'sudo ceph df --format=json'
++        output, code = sentry_unit.run(cmd)
++        if code != 0:
++            msg = ('{} `{}` returned {} '
++                   '{}'.format(sentry_unit.info['unit_name'],
++                               cmd, code, output))
++            amulet.raise_status(amulet.FAIL, msg=msg)
++        return json.loads(output)
++
++    def get_ceph_pool_sample(self, sentry_unit, pool_id=0):
++        """Take a sample of attributes of a ceph pool, returning ceph
++        pool name, object count and disk space used for the specified
++        pool ID number.
++
++        :param sentry_unit: Pointer to amulet sentry instance (juju unit)
++        :param pool_id: Ceph pool ID
++        :returns: List of pool name, object count, kb disk space used
++        """
++        df = self.get_ceph_df(sentry_unit)
++        pool_name = df['pools'][pool_id]['name']
++        obj_count = df['pools'][pool_id]['stats']['objects']
++        kb_used = df['pools'][pool_id]['stats']['kb_used']
++        self.log.debug('Ceph {} pool (ID {}): {} objects, '
++                       '{} kb used'.format(pool_name, pool_id,
++                                           obj_count, kb_used))
++        return pool_name, obj_count, kb_used
++
++    def validate_ceph_pool_samples(self, samples, sample_type="resource pool"):
++        """Validate ceph pool samples taken over time, such as pool
++        object counts or pool kb used, before adding, after adding, and
++        after deleting items which affect those pool attributes.  The
++        2nd element is expected to be greater than the 1st; 3rd is expected
++        to be less than the 2nd.
++
++        :param samples: List containing 3 data samples
++        :param sample_type: String for logging and usage context
++        :returns: None if successful, Failure message otherwise
++        """
++        original, created, deleted = range(3)
++        if samples[created] <= samples[original] or \
++                samples[deleted] >= samples[created]:
++            return ('Ceph {} samples ({}) '
++                    'unexpected.'.format(sample_type, samples))
++        else:
++            self.log.debug('Ceph {} samples (OK): '
++                           '{}'.format(sample_type, samples))
++            return None
+
+=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
+--- hooks/charmhelpers/contrib/openstack/context.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/contrib/openstack/context.py	2015-10-30 01:28:39 +0000
+@@ -122,21 +122,24 @@
+          of specifying multiple key value pairs within the same string. For
+          example, a string in the format of 'key1=value1, key2=value2' will
+          return a dict of:
+-         {'key1': 'value1',
+-          'key2': 'value2'}.
++
++             {'key1': 'value1',
++              'key2': 'value2'}.
+ 
+       2. A string in the above format, but supporting a comma-delimited list
+          of values for the same key. For example, a string in the format of
+          'key1=value1, key2=value3,value4,value5' will return a dict of:
+-         {'key1', 'value1',
+-          'key2', 'value2,value3,value4'}
++
++             {'key1', 'value1',
++              'key2', 'value2,value3,value4'}
+ 
+       3. A string containing a colon character (:) prior to an equal
+          character (=) will be treated as yaml and parsed as such. This can be
+          used to specify more complex key value pairs. For example,
+          a string in the format of 'key1: subkey1=value1, subkey2=value2' will
+          return a dict of:
+-         {'key1', 'subkey1=value1, subkey2=value2'}
++
++             {'key1', 'subkey1=value1, subkey2=value2'}
+ 
+     The provided config_flags string may be a list of comma-separated values
+     which themselves may be comma-separated list of values.
+@@ -240,7 +243,7 @@
+         if self.relation_prefix:
+             password_setting = self.relation_prefix + '_password'
+ 
+-        for rid in relation_ids('shared-db'):
++        for rid in relation_ids(self.interfaces[0]):
+             for unit in related_units(rid):
+                 rdata = relation_get(rid=rid, unit=unit)
+                 host = rdata.get('db_host')
+@@ -891,8 +894,6 @@
+         return ctxt
+ 
+     def __call__(self):
+-        self._ensure_packages()
+-
+         if self.network_manager not in ['quantum', 'neutron']:
+             return {}
+ 
+@@ -1050,13 +1051,22 @@
+         :param config_file : Service's config file to query sections
+         :param interface   : Subordinate interface to inspect
+         """
+-        self.service = service
+         self.config_file = config_file
+-        self.interface = interface
++        if isinstance(service, list):
++            self.services = service
++        else:
++            self.services = [service]
++        if isinstance(interface, list):
++            self.interfaces = interface
++        else:
++            self.interfaces = [interface]
+ 
+     def __call__(self):
+         ctxt = {'sections': {}}
+-        for rid in relation_ids(self.interface):
++        rids = []
++        for interface in self.interfaces:
++            rids.extend(relation_ids(interface))
++        for rid in rids:
+             for unit in related_units(rid):
+                 sub_config = relation_get('subordinate_configuration',
+                                           rid=rid, unit=unit)
+@@ -1068,29 +1078,32 @@
+                             'setting from %s' % rid, level=ERROR)
+                         continue
+ 
+-                    if self.service not in sub_config:
+-                        log('Found subordinate_config on %s but it contained'
+-                            'nothing for %s service' % (rid, self.service),
+-                            level=INFO)
+-                        continue
+-
+-                    sub_config = sub_config[self.service]
+-                    if self.config_file not in sub_config:
+-                        log('Found subordinate_config on %s but it contained'
+-                            'nothing for %s' % (rid, self.config_file),
+-                            level=INFO)
+-                        continue
+-
+-                    sub_config = sub_config[self.config_file]
+-                    for k, v in six.iteritems(sub_config):
+-                        if k == 'sections':
+-                            for section, config_dict in six.iteritems(v):
+-                                log("adding section '%s'" % (section),
+-                                    level=DEBUG)
+-                                ctxt[k][section] = config_dict
+-                        else:
+-                            ctxt[k] = v
+-
++                    for service in self.services:
++                        if service not in sub_config:
++                            log('Found subordinate_config on %s but it contained'
++                                'nothing for %s service' % (rid, service),
++                                level=INFO)
++                            continue
++
++                        sub_config = sub_config[service]
++                        if self.config_file not in sub_config:
++                            log('Found subordinate_config on %s but it contained'
++                                'nothing for %s' % (rid, self.config_file),
++                                level=INFO)
++                            continue
++
++                        sub_config = sub_config[self.config_file]
++                        for k, v in six.iteritems(sub_config):
++                            if k == 'sections':
++                                for section, config_list in six.iteritems(v):
++                                    log("adding section '%s'" % (section),
++                                        level=DEBUG)
++                                    if ctxt[k].get(section):
++                                        ctxt[k][section].extend(config_list)
++                                    else:
++                                        ctxt[k][section] = config_list
++                            else:
++                                ctxt[k] = v
+         log("%d section(s) found" % (len(ctxt['sections'])), level=DEBUG)
+         return ctxt
+ 
+
+=== modified file 'hooks/charmhelpers/contrib/openstack/templates/ceph.conf'
+--- hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/contrib/openstack/templates/ceph.conf	2015-10-30 01:28:39 +0000
+@@ -5,11 +5,11 @@
+ ###############################################################################
+ [global]
+ {% if auth -%}
+- auth_supported = {{ auth }}
+- keyring = /etc/ceph/$cluster.$name.keyring
+- mon host = {{ mon_hosts }}
++auth_supported = {{ auth }}
++keyring = /etc/ceph/$cluster.$name.keyring
++mon host = {{ mon_hosts }}
+ {% endif -%}
+- log to syslog = {{ use_syslog }}
+- err to syslog = {{ use_syslog }}
+- clog to syslog = {{ use_syslog }}
++log to syslog = {{ use_syslog }}
++err to syslog = {{ use_syslog }}
++clog to syslog = {{ use_syslog }}
+ 
+
+=== modified file 'hooks/charmhelpers/contrib/openstack/templating.py'
+--- hooks/charmhelpers/contrib/openstack/templating.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/contrib/openstack/templating.py	2015-10-30 15:39:12 +0000
+@@ -29,14 +29,13 @@
+ try:
+     from jinja2 import FileSystemLoader, ChoiceLoader, Environment, exceptions
+ except ImportError:
+-    # python-jinja2 may not be installed yet, or we're running unittests.
+-    FileSystemLoader = ChoiceLoader = Environment = exceptions = None
++    apt_install('python-jinja2', fatal=True)
++    from jinja2 import FileSystemLoader, ChoiceLoader, Environment, exceptions
+ 
+ 
+ class OSConfigException(Exception):
+     pass
+ 
+-
+ def os_template_dirs(templates_dir, os_release):
+     tmpl_dirs = [(rel, os.path.join(templates_dir, rel))
+                  for rel in six.itervalues(OPENSTACK_CODENAMES)]
+@@ -61,7 +60,6 @@
+         ' '.join(dirs), level=INFO)
+     return dirs
+ 
+-
+ def get_loader(templates_dir, os_release):
+     """
+     Create a jinja2.ChoiceLoader containing template dirs up to
+
+=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
+--- hooks/charmhelpers/contrib/openstack/utils.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/contrib/openstack/utils.py	2015-10-31 07:55:21 +0000
+@@ -25,6 +25,7 @@
+ import os
+ import sys
+ import uuid
++import re
+ 
+ import six
+ import yaml
+@@ -42,7 +43,7 @@
+     INFO,
+     relation_ids,
+     related_units,
+-    relation_set,
++    relation_set
+ )
+ 
+ from charmhelpers.contrib.storage.linux.lvm import (
+@@ -71,7 +72,6 @@
+ DISTRO_PROPOSED = ('deb http://archive.ubuntu.com/ubuntu/ %s-proposed '
+                    'restricted main multiverse universe')
+ 
+-
+ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
+     ('oneiric', 'diablo'),
+     ('precise', 'essex'),
+@@ -81,6 +81,7 @@
+     ('trusty', 'icehouse'),
+     ('utopic', 'juno'),
+     ('vivid', 'kilo'),
++    ('wily', 'liberty'),
+ ])
+ 
+ 
+@@ -93,6 +94,7 @@
+     ('2014.1', 'icehouse'),
+     ('2014.2', 'juno'),
+     ('2015.1', 'kilo'),
++    ('2015.2', 'liberty'),
+ ])
+ 
+ # The ugly duckling
+@@ -115,8 +117,37 @@
+     ('2.2.0', 'juno'),
+     ('2.2.1', 'kilo'),
+     ('2.2.2', 'kilo'),
++    ('2.3.0', 'liberty'),
+ ])
+ 
++# >= Liberty version->codename mapping
++PACKAGE_CODENAMES = {
++    'nova-common': OrderedDict([
++        ('12.0.0', 'liberty'),
++    ]),
++    'neutron-common': OrderedDict([
++        ('7.0.0', 'liberty'),
++    ]),
++    'cinder-common': OrderedDict([
++        ('7.0.0', 'liberty'),
++    ]),
++    'keystone': OrderedDict([
++        ('8.0.0', 'liberty'),
++    ]),
++    'horizon-common': OrderedDict([
++        ('8.0.0', 'liberty'),
++    ]),
++    'ceilometer-common': OrderedDict([
++        ('5.0.0', 'liberty'),
++    ]),
++    'heat-common': OrderedDict([
++        ('5.0.0', 'liberty'),
++    ]),
++    'glance-common': OrderedDict([
++        ('11.0.0', 'liberty'),
++    ]),
++}
++
+ DEFAULT_LOOPBACK_SIZE = '5G'
+ 
+ 
+@@ -200,20 +231,29 @@
+         error_out(e)
+ 
+     vers = apt.upstream_version(pkg.current_ver.ver_str)
++    match = re.match('^(\d)\.(\d)\.(\d)', vers)
++    if match:
++        vers = match.group(0)
+ 
+-    try:
+-        if 'swift' in pkg.name:
+-            swift_vers = vers[:5]
+-            if swift_vers not in SWIFT_CODENAMES:
+-                # Deal with 1.10.0 upward
+-                swift_vers = vers[:6]
+-            return SWIFT_CODENAMES[swift_vers]
+-        else:
+-            vers = vers[:6]
+-            return OPENSTACK_CODENAMES[vers]
+-    except KeyError:
+-        e = 'Could not determine OpenStack codename for version %s' % vers
+-        error_out(e)
++    # >= Liberty independent project versions
++    if (package in PACKAGE_CODENAMES and
++            vers in PACKAGE_CODENAMES[package]):
++        return PACKAGE_CODENAMES[package][vers]
++    else:
++        # < Liberty co-ordinated project versions
++        try:
++            if 'swift' in pkg.name:
++                swift_vers = vers[:5]
++                if swift_vers not in SWIFT_CODENAMES:
++                    # Deal with 1.10.0 upward
++                    swift_vers = vers[:6]
++                return SWIFT_CODENAMES[swift_vers]
++            else:
++                vers = vers[:6]
++                return OPENSTACK_CODENAMES[vers]
++        except KeyError:
++            e = 'Could not determine OpenStack codename for version %s' % vers
++            error_out(e)
+ 
+ 
+ def get_os_version_package(pkg, fatal=True):
+@@ -323,6 +363,9 @@
+             'kilo': 'trusty-updates/kilo',
+             'kilo/updates': 'trusty-updates/kilo',
+             'kilo/proposed': 'trusty-proposed/kilo',
++            'liberty': 'trusty-updates/liberty',
++            'liberty/updates': 'trusty-updates/liberty',
++            'liberty/proposed': 'trusty-proposed/liberty',
+         }
+ 
+         try:
+@@ -518,6 +561,7 @@
+     Clone/install all specified OpenStack repositories.
+ 
+     The expected format of projects_yaml is:
++
+         repositories:
+           - {name: keystone,
+              repository: 'git://git.openstack.org/openstack/keystone.git',
+@@ -525,11 +569,13 @@
+           - {name: requirements,
+              repository: 'git://git.openstack.org/openstack/requirements.git',
+              branch: 'stable/icehouse'}
++
+         directory: /mnt/openstack-git
+         http_proxy: squid-proxy-url
+         https_proxy: squid-proxy-url
+ 
+-        The directory, http_proxy, and https_proxy keys are optional.
++    The directory, http_proxy, and https_proxy keys are optional.
++
+     """
+     global requirements_dir
+     parent_dir = '/mnt/openstack-git'
+@@ -551,6 +597,12 @@
+ 
+     pip_create_virtualenv(os.path.join(parent_dir, 'venv'))
+ 
++    # Upgrade setuptools and pip from default virtualenv versions. The default
++    # versions in trusty break master OpenStack branch deployments.
++    for p in ['pip', 'setuptools']:
++        pip_install(p, upgrade=True, proxy=http_proxy,
++                    venv=os.path.join(parent_dir, 'venv'))
++
+     for p in projects['repositories']:
+         repo = p['repository']
+         branch = p['branch']
+@@ -612,24 +664,24 @@
+     else:
+         repo_dir = dest_dir
+ 
++    venv = os.path.join(parent_dir, 'venv')
++
+     if update_requirements:
+         if not requirements_dir:
+             error_out('requirements repo must be cloned before '
+                       'updating from global requirements.')
+-        _git_update_requirements(repo_dir, requirements_dir)
++        _git_update_requirements(venv, repo_dir, requirements_dir)
+ 
+     juju_log('Installing git repo from dir: {}'.format(repo_dir))
+     if http_proxy:
+-        pip_install(repo_dir, proxy=http_proxy,
+-                    venv=os.path.join(parent_dir, 'venv'))
++        pip_install(repo_dir, proxy=http_proxy, venv=venv)
+     else:
+-        pip_install(repo_dir,
+-                    venv=os.path.join(parent_dir, 'venv'))
++        pip_install(repo_dir, venv=venv)
+ 
+     return repo_dir
+ 
+ 
+-def _git_update_requirements(package_dir, reqs_dir):
++def _git_update_requirements(venv, package_dir, reqs_dir):
+     """
+     Update from global requirements.
+ 
+@@ -638,12 +690,14 @@
+     """
+     orig_dir = os.getcwd()
+     os.chdir(reqs_dir)
+-    cmd = ['python', 'update.py', package_dir]
++    python = os.path.join(venv, 'bin/python')
++    cmd = [python, 'update.py', package_dir]
+     try:
+         subprocess.check_call(cmd)
+     except subprocess.CalledProcessError:
+         package = os.path.basename(package_dir)
+-        error_out("Error updating {} from global-requirements.txt".format(package))
++        error_out("Error updating {} from "
++                  "global-requirements.txt".format(package))
+     os.chdir(orig_dir)
+ 
+ 
+@@ -690,7 +744,6 @@
+ 
+     return None
+ 
+-
+ def remote_restart(rel_name, remote_service=None):
+     trigger = {
+         'restart-trigger': str(uuid.uuid4()),
+@@ -705,3 +758,4 @@
+             relation_set(relation_id=rid,
+                          relation_settings=trigger,
+                          )
++                               
+
+=== modified file 'hooks/charmhelpers/contrib/python/packages.py'
+--- hooks/charmhelpers/contrib/python/packages.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/contrib/python/packages.py	2015-10-30 01:28:43 +0000
+@@ -36,6 +36,8 @@
+ def parse_options(given, available):
+     """Given a set of options, check if available"""
+     for key, value in sorted(given.items()):
++        if not value:
++            continue
+         if key in available:
+             yield "--{0}={1}".format(key, value)
+ 
+
+=== modified file 'hooks/charmhelpers/contrib/storage/linux/ceph.py'
+--- hooks/charmhelpers/contrib/storage/linux/ceph.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/contrib/storage/linux/ceph.py	2015-10-30 01:28:39 +0000
+@@ -60,12 +60,12 @@
+ KEYFILE = '/etc/ceph/ceph.client.{}.key'
+ 
+ CEPH_CONF = """[global]
+- auth supported = {auth}
+- keyring = {keyring}
+- mon host = {mon_hosts}
+- log to syslog = {use_syslog}
+- err to syslog = {use_syslog}
+- clog to syslog = {use_syslog}
++auth supported = {auth}
++keyring = {keyring}
++mon host = {mon_hosts}
++log to syslog = {use_syslog}
++err to syslog = {use_syslog}
++clog to syslog = {use_syslog}
+ """
+ 
+ 
+
+=== modified file 'hooks/charmhelpers/contrib/storage/linux/utils.py'
+--- hooks/charmhelpers/contrib/storage/linux/utils.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/contrib/storage/linux/utils.py	2015-10-30 01:28:39 +0000
+@@ -43,9 +43,10 @@
+ 
+     :param block_device: str: Full path of block device to clean.
+     '''
++    # https://github.com/ceph/ceph/commit/fdd7f8d83afa25c4e09aaedd90ab93f3b64a677b
+     # sometimes sgdisk exits non-zero; this is OK, dd will clean up
+-    call(['sgdisk', '--zap-all', '--mbrtogpt',
+-          '--clear', block_device])
++    call(['sgdisk', '--zap-all', '--', block_device])
++    call(['sgdisk', '--clear', '--mbrtogpt', '--', block_device])
+     dev_end = check_output(['blockdev', '--getsz',
+                             block_device]).decode('UTF-8')
+     gpt_end = int(dev_end.split()[0]) - 100
+@@ -67,4 +68,4 @@
+     out = check_output(['mount']).decode('UTF-8')
+     if is_partition:
+         return bool(re.search(device + r"\b", out))
+-    return bool(re.search(device + r"[0-9]+\b", out))
++    return bool(re.search(device + r"[0-9]*\b", out))
+
+=== modified file 'hooks/charmhelpers/core/hookenv.py'
+--- hooks/charmhelpers/core/hookenv.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/core/hookenv.py	2015-10-30 01:28:39 +0000
+@@ -21,7 +21,10 @@
+ #  Charm Helpers Developers <[e-mail]>
+ 
+ from __future__ import print_function
++import copy
++from distutils.version import LooseVersion
+ from functools import wraps
++import glob
+ import os
+ import json
+ import yaml
+@@ -71,6 +74,7 @@
+         res = func(*args, **kwargs)
+         cache[key] = res
+         return res
++    wrapper._wrapped = func
+     return wrapper
+ 
+ 
+@@ -170,9 +174,19 @@
+     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)
++@cached
++def relation_id(relation_name=None, service_or_unit=None):
++    """The relation ID for the current or a specified relation"""
++    if not relation_name and not service_or_unit:
++        return os.environ.get('JUJU_RELATION_ID', None)
++    elif relation_name and service_or_unit:
++        service_name = service_or_unit.split('/')[0]
++        for relid in relation_ids(relation_name):
++            remote_service = remote_service_name(relid)
++            if remote_service == service_name:
++                return relid
++    else:
++        raise ValueError('Must specify neither or both of relation_name and service_or_unit')
+ 
+ 
+ def local_unit():
+@@ -190,9 +204,20 @@
+     return local_unit().split('/')[0]
+ 
+ 
++@cached
++def remote_service_name(relid=None):
++    """The remote service name for a given relation-id (or the current relation)"""
++    if relid is None:
++        unit = remote_unit()
++    else:
++        units = related_units(relid)
++        unit = units[0] if units else None
++    return unit.split('/')[0] if unit else None
++
++
+ def hook_name():
+     """The name of the currently executing hook"""
+-    return os.path.basename(sys.argv[0])
++    return os.environ.get('JUJU_HOOK_NAME', os.path.basename(sys.argv[0]))
+ 
+ 
+ class Config(dict):
+@@ -242,29 +267,7 @@
+         self.path = os.path.join(charm_dir(), Config.CONFIG_FILE_NAME)
+         if os.path.exists(self.path):
+             self.load_previous()
+-
+-    def __getitem__(self, key):
+-        """For regular dict lookups, check the current juju config first,
+-        then the previous (saved) copy. This ensures that user-saved values
+-        will be returned by a dict lookup.
+-
+-        """
+-        try:
+-            return dict.__getitem__(self, key)
+-        except KeyError:
+-            return (self._prev_dict or {})[key]
+-
+-    def get(self, key, default=None):
+-        try:
+-            return self[key]
+-        except KeyError:
+-            return default
+-
+-    def keys(self):
+-        prev_keys = []
+-        if self._prev_dict is not None:
+-            prev_keys = self._prev_dict.keys()
+-        return list(set(prev_keys + list(dict.keys(self))))
++        atexit(self._implicit_save)
+ 
+     def load_previous(self, path=None):
+         """Load previous copy of config from disk.
+@@ -283,6 +286,9 @@
+         self.path = path or self.path
+         with open(self.path) as f:
+             self._prev_dict = json.load(f)
++        for k, v in copy.deepcopy(self._prev_dict).items():
++            if k not in self:
++                self[k] = v
+ 
+     def changed(self, key):
+         """Return True if the current value for this key is different from
+@@ -314,13 +320,13 @@
+         instance.
+ 
+         """
+-        if self._prev_dict:
+-            for k, v in six.iteritems(self._prev_dict):
+-                if k not in self:
+-                    self[k] = v
+         with open(self.path, 'w') as f:
+             json.dump(self, f)
+ 
++    def _implicit_save(self):
++        if self.implicit_save:
++            self.save()
++
+ 
+ @cached
+ def config(scope=None):
+@@ -485,6 +491,63 @@
+ 
+ 
+ @cached
++def relation_to_interface(relation_name):
++    """
++    Given the name of a relation, return the interface that relation uses.
++
++    :returns: The interface name, or ``None``.
++    """
++    return relation_to_role_and_interface(relation_name)[1]
++
++
++@cached
++def relation_to_role_and_interface(relation_name):
++    """
++    Given the name of a relation, return the role and the name of the interface
++    that relation uses (where role is one of ``provides``, ``requires``, or ``peer``).
++
++    :returns: A tuple containing ``(role, interface)``, or ``(None, None)``.
++    """
++    _metadata = metadata()
++    for role in ('provides', 'requires', 'peer'):
++        interface = _metadata.get(role, {}).get(relation_name, {}).get('interface')
++        if interface:
++            return role, interface
++    return None, None
++
++
++@cached
++def role_and_interface_to_relations(role, interface_name):
++    """
++    Given a role and interface name, return a list of relation names for the
++    current charm that use that interface under that role (where role is one
++    of ``provides``, ``requires``, or ``peer``).
++
++    :returns: A list of relation names.
++    """
++    _metadata = metadata()
++    results = []
++    for relation_name, relation in _metadata.get(role, {}).items():
++        if relation['interface'] == interface_name:
++            results.append(relation_name)
++    return results
++
++
++@cached
++def interface_to_relations(interface_name):
++    """
++    Given an interface, return a list of relation names for the current
++    charm that use that interface.
++
++    :returns: A list of relation names.
++    """
++    results = []
++    for role in ('provides', 'requires', 'peer'):
++        results.extend(role_and_interface_to_relations(role, interface_name))
++    return results
++
++
++@cached
+ def charm_name():
+     """Get the name of the current charm as is specified on metadata.yaml"""
+     return metadata().get('name')
+@@ -587,10 +650,14 @@
+             hooks.execute(sys.argv)
+     """
+ 
+-    def __init__(self, config_save=True):
++    def __init__(self, config_save=None):
+         super(Hooks, self).__init__()
+         self._hooks = {}
+-        self._config_save = config_save
++
++        # For unknown reasons, we allow the Hooks constructor to override
++        # config().implicit_save.
++        if config_save is not None:
++            config().implicit_save = config_save
+ 
+     def register(self, name, function):
+         """Register a hook"""
+@@ -598,13 +665,16 @@
+ 
+     def execute(self, args):
+         """Execute a registered hook based on args[0]"""
++        _run_atstart()
+         hook_name = os.path.basename(args[0])
+         if hook_name in self._hooks:
+-            self._hooks[hook_name]()
+-            if self._config_save:
+-                cfg = config()
+-                if cfg.implicit_save:
+-                    cfg.save()
++            try:
++                self._hooks[hook_name]()
++            except SystemExit as x:
++                if x.code is None or x.code == 0:
++                    _run_atexit()
++                raise
++            _run_atexit()
+         else:
+             raise UnregisteredHookError(hook_name)
+ 
+@@ -653,6 +723,21 @@
+     subprocess.check_call(['action-fail', message])
+ 
+ 
++def action_name():
++    """Get the name of the currently executing action."""
++    return os.environ.get('JUJU_ACTION_NAME')
++
++
++def action_uuid():
++    """Get the UUID of the currently executing action."""
++    return os.environ.get('JUJU_ACTION_UUID')
++
++
++def action_tag():
++    """Get the tag for the currently executing action."""
++    return os.environ.get('JUJU_ACTION_TAG')
++
++
+ def status_set(workload_state, message):
+     """Set the workload state with a message
+ 
+@@ -732,13 +817,80 @@
+ @translate_exc(from_exc=OSError, to_exc=NotImplementedError)
+ def leader_set(settings=None, **kwargs):
+     """Juju leader set value(s)"""
+-    log("Juju leader-set '%s'" % (settings), level=DEBUG)
++    # Don't log secrets.
++    # log("Juju leader-set '%s'" % (settings), level=DEBUG)
+     cmd = ['leader-set']
+     settings = settings or {}
+     settings.update(kwargs)
+-    for k, v in settings.iteritems():
++    for k, v in settings.items():
+         if v is None:
+             cmd.append('{}='.format(k))
+         else:
+             cmd.append('{}={}'.format(k, v))
+     subprocess.check_call(cmd)
++
++
++@cached
++def juju_version():
++    """Full version string (eg. '1.23.3.1-trusty-amd64')"""
++    # Per https://bugs.launchpad.net/juju-core/+bug/1455368/comments/1
++    jujud = glob.glob('/var/lib/juju/tools/machine-*/jujud')[0]
++    return subprocess.check_output([jujud, 'version'],
++                                   universal_newlines=True).strip()
++
++
++@cached
++def has_juju_version(minimum_version):
++    """Return True if the Juju version is at least the provided version"""
++    return LooseVersion(juju_version()) >= LooseVersion(minimum_version)
++
++
++_atexit = []
++_atstart = []
++
++
++def atstart(callback, *args, **kwargs):
++    '''Schedule a callback to run before the main hook.
++
++    Callbacks are run in the order they were added.
++
++    This is useful for modules and classes to perform initialization
++    and inject behavior. In particular:
++
++        - Run common code before all of your hooks, such as logging
++          the hook name or interesting relation data.
++        - Defer object or module initialization that requires a hook
++          context until we know there actually is a hook context,
++          making testing easier.
++        - Rather than requiring charm authors to include boilerplate to
++          invoke your helper's behavior, have it run automatically if
++          your object is instantiated or module imported.
++
++    This is not at all useful after your hook framework as been launched.
++    '''
++    global _atstart
++    _atstart.append((callback, args, kwargs))
++
++
++def atexit(callback, *args, **kwargs):
++    '''Schedule a callback to run on successful hook completion.
++
++    Callbacks are run in the reverse order that they were added.'''
++    _atexit.append((callback, args, kwargs))
++
++
++def _run_atstart():
++    '''Hook frameworks must invoke this before running the main hook body.'''
++    global _atstart
++    for callback, args, kwargs in _atstart:
++        callback(*args, **kwargs)
++    del _atstart[:]
++
++
++def _run_atexit():
++    '''Hook frameworks must invoke this after the main hook body has
++    successfully completed. Do not invoke it if the hook fails.'''
++    global _atexit
++    for callback, args, kwargs in reversed(_atexit):
++        callback(*args, **kwargs)
++    del _atexit[:]
+
+=== modified file 'hooks/charmhelpers/core/host.py'
+--- hooks/charmhelpers/core/host.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/core/host.py	2015-10-30 01:28:39 +0000
+@@ -63,6 +63,36 @@
+     return service_result
+ 
+ 
++def service_pause(service_name, init_dir=None):
++    """Pause a system service.
++
++    Stop it, and prevent it from starting again at boot."""
++    if init_dir is None:
++        init_dir = "/etc/init"
++    stopped = service_stop(service_name)
++    # XXX: Support systemd too
++    override_path = os.path.join(
++        init_dir, '{}.override'.format(service_name))
++    with open(override_path, 'w') as fh:
++        fh.write("manual\n")
++    return stopped
++
++
++def service_resume(service_name, init_dir=None):
++    """Resume a system service.
++
++    Reenable starting again at boot. Start the service"""
++    # XXX: Support systemd too
++    if init_dir is None:
++        init_dir = "/etc/init"
++    override_path = os.path.join(
++        init_dir, '{}.override'.format(service_name))
++    if os.path.exists(override_path):
++        os.unlink(override_path)
++    started = service_start(service_name)
++    return started
++
++
+ def service(action, service_name):
+     """Control a system service"""
+     cmd = ['service', service_name, action]
+@@ -120,7 +150,7 @@
+ 
+ def user_exists(username):
+     try:
+-        user_info = pwd.getpwnam(username)
++        pwd.getpwnam(username)
+         user_exists = True
+     except KeyError:
+         user_exists = False
+@@ -149,11 +179,7 @@
+ 
+ def add_user_to_group(username, group):
+     """Add a user to a group"""
+-    cmd = [
+-        'gpasswd', '-a',
+-        username,
+-        group
+-    ]
++    cmd = ['gpasswd', '-a', username, group]
+     log("Adding user {} to group {}".format(username, group))
+     subprocess.check_call(cmd)
+ 
+@@ -263,7 +289,6 @@
+     return system_mounts
+ 
+ 
+-
+ def fstab_mount(mountpoint):
+     cmd_args = ['mount', mountpoint]
+     try:
+
+=== modified file 'hooks/charmhelpers/core/hugepage.py'
+--- hooks/charmhelpers/core/hugepage.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/core/hugepage.py	2015-10-30 01:28:39 +0000
+@@ -1,4 +1,3 @@
+-
+ #!/usr/bin/env python
+ # -*- coding: utf-8 -*-
+ 
+@@ -19,10 +18,8 @@
+ # along with charm-helpers.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ import yaml
+-from charmhelpers.core.fstab import Fstab
+-from charmhelpers.core.sysctl import (
+-    create,
+-)
++from charmhelpers.core import fstab
++from charmhelpers.core import sysctl
+ from charmhelpers.core.host import (
+     add_group,
+     add_user_to_group,
+@@ -30,8 +27,9 @@
+     mkdir,
+ )
+ 
++
+ def hugepage_support(user, group='hugetlb', nr_hugepages=256,
+-                     max_map_count=65536, mnt_point='/hugepages',
++                     max_map_count=65536, mnt_point='/run/hugepages/kvm',
+                      pagesize='2MB', mount=True):
+     group_info = add_group(group)
+     gid = group_info.gr_gid
+@@ -41,14 +39,14 @@
+         'vm.max_map_count': max_map_count,  # 1GB
+         'vm.hugetlb_shm_group': gid,
+     }
+-    create(yaml.dump(sysctl_settings), '/etc/sysctl.d/10-hugepage.conf')
++    sysctl.create(yaml.dump(sysctl_settings), '/etc/sysctl.d/10-hugepage.conf')
+     mkdir(mnt_point, owner='root', group='root', perms=0o755, force=False)
+-    fstab = Fstab()
+-    fstab_entry = fstab.get_entry_by_attr('mountpoint', mnt_point)
++    lfstab = fstab.Fstab()
++    fstab_entry = lfstab.get_entry_by_attr('mountpoint', mnt_point)
+     if fstab_entry:
+-        fstab.remove_entry(fstab_entry)
+-    entry = fstab.Entry('nodev', mnt_point, 'hugetlbfs',
+-                        'mode=1770,gid={},pagesize={}'.format(gid, pagesize), 0, 0)
+-    fstab.add_entry(entry)
++        lfstab.remove_entry(fstab_entry)
++    entry = lfstab.Entry('nodev', mnt_point, 'hugetlbfs',
++                         'mode=1770,gid={},pagesize={}'.format(gid, pagesize), 0, 0)
++    lfstab.add_entry(entry)
+     if mount:
+         fstab_mount(mnt_point)
+
+=== modified file 'hooks/charmhelpers/core/services/base.py'
+--- hooks/charmhelpers/core/services/base.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/core/services/base.py	2015-10-30 01:28:39 +0000
+@@ -128,15 +128,18 @@
+         """
+         Handle the current hook by doing The Right Thing with the registered services.
+         """
+-        hook_name = hookenv.hook_name()
+-        if hook_name == 'stop':
+-            self.stop_services()
+-        else:
+-            self.reconfigure_services()
+-            self.provide_data()
+-        cfg = hookenv.config()
+-        if cfg.implicit_save:
+-            cfg.save()
++        hookenv._run_atstart()
++        try:
++            hook_name = hookenv.hook_name()
++            if hook_name == 'stop':
++                self.stop_services()
++            else:
++                self.reconfigure_services()
++                self.provide_data()
++        except SystemExit as x:
++            if x.code is None or x.code == 0:
++                hookenv._run_atexit()
++        hookenv._run_atexit()
+ 
+     def provide_data(self):
+         """
+
+=== modified file 'hooks/charmhelpers/core/unitdata.py'
+--- hooks/charmhelpers/core/unitdata.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/core/unitdata.py	2015-10-30 01:28:39 +0000
+@@ -152,6 +152,7 @@
+ import collections
+ import contextlib
+ import datetime
++import itertools
+ import json
+ import os
+ import pprint
+@@ -164,8 +165,7 @@
+ class Storage(object):
+     """Simple key value database for local unit state within charms.
+ 
+-    Modifications are automatically committed at hook exit. That's
+-    currently regardless of exit code.
++    Modifications are not persisted unless :meth:`flush` is called.
+ 
+     To support dicts, lists, integer, floats, and booleans values
+     are automatically json encoded/decoded.
+@@ -173,8 +173,11 @@
+     def __init__(self, path=None):
+         self.db_path = path
+         if path is None:
+-            self.db_path = os.path.join(
+-                os.environ.get('CHARM_DIR', ''), '.unit-state.db')
++            if 'UNIT_STATE_DB' in os.environ:
++                self.db_path = os.environ['UNIT_STATE_DB']
++            else:
++                self.db_path = os.path.join(
++                    os.environ.get('CHARM_DIR', ''), '.unit-state.db')
+         self.conn = sqlite3.connect('%s' % self.db_path)
+         self.cursor = self.conn.cursor()
+         self.revision = None
+@@ -189,15 +192,8 @@
+         self.conn.close()
+         self._closed = True
+ 
+-    def _scoped_query(self, stmt, params=None):
+-        if params is None:
+-            params = []
+-        return stmt, params
+-
+     def get(self, key, default=None, record=False):
+-        self.cursor.execute(
+-            *self._scoped_query(
+-                'select data from kv where key=?', [key]))
++        self.cursor.execute('select data from kv where key=?', [key])
+         result = self.cursor.fetchone()
+         if not result:
+             return default
+@@ -206,33 +202,81 @@
+         return json.loads(result[0])
+ 
+     def getrange(self, key_prefix, strip=False):
+-        stmt = "select key, data from kv where key like '%s%%'" % key_prefix
+-        self.cursor.execute(*self._scoped_query(stmt))
++        """
++        Get a range of keys starting with a common prefix as a mapping of
++        keys to values.
++
++        :param str key_prefix: Common prefix among all keys
++        :param bool strip: Optionally strip the common prefix from the key
++            names in the returned dict
++        :return dict: A (possibly empty) dict of key-value mappings
++        """
++        self.cursor.execute("select key, data from kv where key like ?",
++                            ['%s%%' % key_prefix])
+         result = self.cursor.fetchall()
+ 
+         if not result:
+-            return None
++            return {}
+         if not strip:
+             key_prefix = ''
+         return dict([
+             (k[len(key_prefix):], json.loads(v)) for k, v in result])
+ 
+     def update(self, mapping, prefix=""):
++        """
++        Set the values of multiple keys at once.
++
++        :param dict mapping: Mapping of keys to values
++        :param str prefix: Optional prefix to apply to all keys in `mapping`
++            before setting
++        """
+         for k, v in mapping.items():
+             self.set("%s%s" % (prefix, k), v)
+ 
+     def unset(self, key):
++        """
++        Remove a key from the database entirely.
++        """
+         self.cursor.execute('delete from kv where key=?', [key])
+         if self.revision and self.cursor.rowcount:
+             self.cursor.execute(
+                 'insert into kv_revisions values (?, ?, ?)',
+                 [key, self.revision, json.dumps('DELETED')])
+ 
++    def unsetrange(self, keys=None, prefix=""):
++        """
++        Remove a range of keys starting with a common prefix, from the database
++        entirely.
++
++        :param list keys: List of keys to remove.
++        :param str prefix: Optional prefix to apply to all keys in ``keys``
++            before removing.
++        """
++        if keys is not None:
++            keys = ['%s%s' % (prefix, key) for key in keys]
++            self.cursor.execute('delete from kv where key in (%s)' % ','.join(['?'] * len(keys)), keys)
++            if self.revision and self.cursor.rowcount:
++                self.cursor.execute(
++                    'insert into kv_revisions values %s' % ','.join(['(?, ?, ?)'] * len(keys)),
++                    list(itertools.chain.from_iterable((key, self.revision, json.dumps('DELETED')) for key in keys)))
++        else:
++            self.cursor.execute('delete from kv where key like ?',
++                                ['%s%%' % prefix])
++            if self.revision and self.cursor.rowcount:
++                self.cursor.execute(
++                    'insert into kv_revisions values (?, ?, ?)',
++                    ['%s%%' % prefix, self.revision, json.dumps('DELETED')])
++
+     def set(self, key, value):
++        """
++        Set a value in the database.
++
++        :param str key: Key to set the value for
++        :param value: Any JSON-serializable value to be set
++        """
+         serialized = json.dumps(value)
+ 
+-        self.cursor.execute(
+-            'select data from kv where key=?', [key])
++        self.cursor.execute('select data from kv where key=?', [key])
+         exists = self.cursor.fetchone()
+ 
+         # Skip mutations to the same value
+
+=== modified file 'hooks/charmhelpers/fetch/__init__.py'
+--- hooks/charmhelpers/fetch/__init__.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/fetch/__init__.py	2015-10-30 01:28:39 +0000
+@@ -90,6 +90,14 @@
+     'kilo/proposed': 'trusty-proposed/kilo',
+     'trusty-kilo/proposed': 'trusty-proposed/kilo',
+     'trusty-proposed/kilo': 'trusty-proposed/kilo',
++    # Liberty
++    'liberty': 'trusty-updates/liberty',
++    'trusty-liberty': 'trusty-updates/liberty',
++    'trusty-liberty/updates': 'trusty-updates/liberty',
++    'trusty-updates/liberty': 'trusty-updates/liberty',
++    'liberty/proposed': 'trusty-proposed/liberty',
++    'trusty-liberty/proposed': 'trusty-proposed/liberty',
++    'trusty-proposed/liberty': 'trusty-proposed/liberty',
+ }
+ 
+ # The order of this list is very important. Handlers should be listed in from
+@@ -215,19 +223,27 @@
+     _run_apt_command(cmd, fatal)
+ 
+ 
++def apt_mark(packages, mark, fatal=False):
++    """Flag one or more packages using apt-mark"""
++    cmd = ['apt-mark', mark]
++    if isinstance(packages, six.string_types):
++        cmd.append(packages)
++    else:
++        cmd.extend(packages)
++    log("Holding {}".format(packages))
++
++    if fatal:
++        subprocess.check_call(cmd, universal_newlines=True)
++    else:
++        subprocess.call(cmd, universal_newlines=True)
++
++
+ def apt_hold(packages, fatal=False):
+-    """Hold one or more packages"""
+-    cmd = ['apt-mark', 'hold']
+-    if isinstance(packages, six.string_types):
+-        cmd.append(packages)
+-    else:
+-        cmd.extend(packages)
+-    log("Holding {}".format(packages))
+-
+-    if fatal:
+-        subprocess.check_call(cmd)
+-    else:
+-        subprocess.call(cmd)
++    return apt_mark(packages, 'hold', fatal=fatal)
++
++
++def apt_unhold(packages, fatal=False):
++    return apt_mark(packages, 'unhold', fatal=fatal)
+ 
+ 
+ def add_source(source, key=None):
+@@ -370,8 +386,9 @@
+     for handler in handlers:
+         try:
+             installed_to = handler.install(source, *args, **kwargs)
+-        except UnhandledSource:
+-            pass
++        except UnhandledSource as e:
++            log('Install source attempt unsuccessful: {}'.format(e),
++                level='WARNING')
+     if not installed_to:
+         raise UnhandledSource("No handler found for source {}".format(source))
+     return installed_to
+
+=== modified file 'hooks/charmhelpers/fetch/archiveurl.py'
+--- hooks/charmhelpers/fetch/archiveurl.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/fetch/archiveurl.py	2015-10-30 01:28:39 +0000
+@@ -77,6 +77,8 @@
+     def can_handle(self, source):
+         url_parts = self.parse_url(source)
+         if url_parts.scheme not in ('http', 'https', 'ftp', 'file'):
++            # XXX: Why is this returning a boolean and a string? It's
++            # doomed to fail since "bool(can_handle('foo://'))"  will be True.
+             return "Wrong source type"
+         if get_archive_handler(self.base_url(source)):
+             return True
+@@ -155,7 +157,11 @@
+             else:
+                 algorithms = hashlib.algorithms_available
+             if key in algorithms:
+-                check_hash(dld_file, value, key)
++                if len(value) != 1:
++                    raise TypeError(
++                        "Expected 1 hash value, not %d" % len(value))
++                expected = value[0]
++                check_hash(dld_file, expected, key)
+         if checksum:
+             check_hash(dld_file, checksum, hash_type)
+         return extract(dld_file, dest)
+
+=== modified file 'hooks/charmhelpers/fetch/giturl.py'
+--- hooks/charmhelpers/fetch/giturl.py	2015-06-24 12:22:08 +0000
++++ hooks/charmhelpers/fetch/giturl.py	2015-10-30 01:28:39 +0000
+@@ -67,7 +67,7 @@
+         try:
+             self.clone(source, dest_dir, branch, depth)
+         except GitCommandError as e:
+-            raise UnhandledSource(e.message)
++            raise UnhandledSource(e)
+         except OSError as e:
+             raise UnhandledSource(e.strerror)
+         return dest_dir
+