Merge lp:~openstack-charmers/charms/precise/cinder/icehouse into lp:~openstack-charmers-archive/charms/precise/cinder/trunk

[James Page]

Update for OpenStack Icehouse

Support for whitelisting of block devices in block-device config.

Support for multi-backend through suboridinate interfaces.

[lp:~openstack-charmers/charms/precise/cinder/icehouse]

33. By James Page on 2014-04-16

[james-page,hazmat,yolanda.robla,r=james-page,t=*]

Support for Icehouse on 12.04 and 14.04
Support for Active/Active and SSL RabbitMQ
Support for SSL MySQL
Support for SSL endpoints
Support for PostgreSQL

=== modified file 'Makefile'
--- Makefile	2013-10-19 16:58:37 +0000
+++ Makefile	2014-04-16 08:36:27 +0000
@@ -2,8 +2,7 @@
 PYTHON := /usr/bin/env python
 
 lint:
-	@flake8 --exclude hooks/charmhelpers hooks
-	@flake8 --exclude hooks/charmhelpers unit_tests
+	@flake8 --exclude hooks/charmhelpers hooks unit_tests
 	@charm proof
 
 test:

=== modified file 'config.yaml'
--- config.yaml	2014-03-25 18:44:23 +0000
+++ config.yaml	2014-04-16 08:36:27 +0000
@@ -1,125 +1,145 @@
 options:
-    openstack-origin:
-        default: distro
-        type: string
-        description: |
-          Repository from which to install.  May be one of the following:
-          distro (default), ppa:somecustom/ppa, a deb url sources entry,
-          or a supported Cloud Archive release pocket.
-
-          Supported Cloud Archive sources include: cloud:precise-folsom,
-          cloud:precise-folsom/updates, cloud:precise-folsom/staging,
-          cloud:precise-folsom/proposed.
-
-          When deploying to Precise, the default distro option will use
-          the cloud:precise-folsom/updates repository instead, since Cinder
-          was not available in the Ubuntu archive for Precise and is only
-          available via the Ubuntu Cloud Archive.
-    enabled-services:
-        default: all
-        type: string
-        description: |
-            If splitting cinder services between units, define which services
-            to install and configure.
-    block-device:
-        default: sdb
-        type: string
-        description: |
-            The *available* block device on which to create LVM volume group.
-            May also be set to None for deployments that will not need local
-            storage (eg, Ceph/RBD-backed volumes).
-    ceph-osd-replication-count:
-        default: 2
-        type: int
-        description: |
-            This value dictates the number of replicas ceph must make of any
-            object it stores withing the cinder rbd pool. Of course, this only
-            applies if using Ceph as a backend store. Note that once the cinder
-            rbd pool has been created, changing this value will not have any
-            effect (although it can be changed in ceph by manually configuring
-            your ceph cluster).
-    volume-group:
-        default: cinder-volumes
-        type: string
-        description: Name of volume group to create and store Cinder volumes.
-    overwrite:
-        default: "false"
-        type: string
-        description: |
-            If true, charm will attempt to overwrite block devices containin
-            previous filesystems or LVM, assuming it is not in use.
-    database-user:
-        default: cinder
-        type: string
-        description: Username to request database access.
-    database:
-        default: cinder
-        type: string
-        description: Database to request access.
-    rabbit-user:
-        default: cinder
-        type: string
-        description: Username to request access on rabbitmq-server.
-    rabbit-vhost:
-        default: openstack
-        type: string
-        description: RabbitMQ virtual host to request access on rabbitmq-server.
-    api-listening-port:
-        default: 8776
-        type: int
-        description: OpenStack Volume API listening port.
-    region:
-        default: RegionOne
-        type: string
-        description: OpenStack Region
-    glance-api-version:
-        default: 1
-        type: int
-        description: |
-          Newer storage drivers may require the v2 Glance API to perform certain
-          actions e.g. the RBD driver requires requires this to support COW
-          cloning of images. This option will default to v1 for backwards
-          compatibility older glance services.
-    use-syslog:
-        type: boolean
-        default: False
-        description: |
-          If set to True, supporting services will log to syslog.
-    # HA configuration settings
-    vip:
-        type: string
-        description: "Virtual IP to use to front cinder API in ha configuration"
-    vip_iface:
-        type: string
-        default: eth0
-        description: "Network Interface where to place the Virtual IP"
-    vip_cidr:
-        type: int
-        default: 24
-        description: "Netmask that will be used for the Virtual IP"
-    ha-bindiface:
-        type: string
-        default: eth0
-        description: |
-          Default network interface on which HA cluster will bind to communication
-          with the other members of the HA Cluster.
-    ha-mcastport:
-        type: int
-        default: 5401
-        description: |
-          Default multicast port number that will be used to communicate between
-          HA Cluster nodes.
-    # Per-service HTTPS configuration.
-    ssl_cert:
-        type: string
-        description: |
-          SSL certificate to install and use for API ports.  Setting this value
-          and ssl_key will enable reverse proxying, point Glance's entry in the
-          Keystone catalog to use https, and override any certficiate and key
-          issued by Keystone (if it is configured to do so).
-    ssl_key:
-        type: string
-        description: SSL key to use with certificate specified as ssl_cert.
-    config-flags:
-        type: string
-        description: Comma separated list of key=value config flags to be set in cinder.conf.
+  openstack-origin:
+    default: distro
+    type: string
+    description: |
+      Repository from which to install.  May be one of the following:
+      distro (default), ppa:somecustom/ppa, a deb url sources entry,
+      or a supported Cloud Archive release pocket.
+
+      Supported Cloud Archive sources include: cloud:precise-folsom,
+      cloud:precise-folsom/updates, cloud:precise-folsom/staging,
+      cloud:precise-folsom/proposed.
+
+      When deploying to Precise, the default distro option will use
+      the cloud:precise-folsom/updates repository instead, since Cinder
+      was not available in the Ubuntu archive for Precise and is only
+      available via the Ubuntu Cloud Archive.
+  enabled-services:
+    default: all
+    type: string
+    description: |
+      If splitting cinder services between units, define which services
+      to install and configure.
+  block-device:
+    default: sdb
+    type: string
+    description: |
+      The block devices on which to create LVM volume group.
+
+      May also be set to None for deployments that will not need local
+      storage (eg, Ceph/RBD-backed volumes).
+
+      This can also be a space delimited list of block devices to attempt
+      to use in the cinder LVM volume group - each block device detected
+      will be added to the available physical volumes in the volume group.
+  ceph-osd-replication-count:
+    default: 2
+    type: int
+    description: |
+      This value dictates the number of replicas ceph must make of any
+      object it stores withing the cinder rbd pool. Of course, this only
+      applies if using Ceph as a backend store. Note that once the cinder
+      rbd pool has been created, changing this value will not have any
+      effect (although it can be changed in ceph by manually configuring
+      your ceph cluster).
+  volume-group:
+    default: cinder-volumes
+    type: string
+    description: Name of volume group to create and store Cinder volumes.
+  overwrite:
+    default: "false"
+    type: string
+    description: |
+      If true, charm will attempt to overwrite block devices containin
+      previous filesystems or LVM, assuming it is not in use.
+  database-user:
+    default: cinder
+    type: string
+    description: Username to request database access.
+  database:
+    default: cinder
+    type: string
+    description: Database to request access.
+  rabbit-user:
+    default: cinder
+    type: string
+    description: Username to request access on rabbitmq-server.
+  rabbit-vhost:
+    default: openstack
+    type: string
+    description: RabbitMQ virtual host to request access on rabbitmq-server.
+  api-listening-port:
+    default: 8776
+    type: int
+    description: OpenStack Volume API listening port.
+  region:
+    default: RegionOne
+    type: string
+    description: OpenStack Region
+  glance-api-version:
+    default: 1
+    type: int
+    description: |
+      Newer storage drivers may require the v2 Glance API to perform certain
+      actions e.g. the RBD driver requires requires this to support COW
+      cloning of images. This option will default to v1 for backwards
+      compatibility older glance services.
+  use-syslog:
+    type: boolean
+    default: False
+    description: |
+      By default, all services will log into their corresponding log files.
+      Setting this to True will force all services to log to the syslog.
+  debug:
+    default: False
+    type: boolean
+    description: Enable debug logging
+  verbose:
+    default: False
+    type: boolean
+    description: Enable verbose logging
+  # HA configuration settings
+  vip:
+    type: string
+    description: "Virtual IP to use to front cinder API in ha configuration"
+  vip_iface:
+    type: string
+    default: eth0
+    description: "Network Interface where to place the Virtual IP"
+  vip_cidr:
+    type: int
+    default: 24
+    description: "Netmask that will be used for the Virtual IP"
+  ha-bindiface:
+    type: string
+    default: eth0
+    description: |
+      Default network interface on which HA cluster will bind to communication
+      with the other members of the HA Cluster.
+  ha-mcastport:
+    type: int
+    default: 5401
+    description: |
+      Default multicast port number that will be used to communicate between
+      HA Cluster nodes.
+  # Per-service HTTPS configuration.
+  ssl_cert:
+    type: string
+    description: |
+      SSL certificate to install and use for API ports.  Setting this value
+      and ssl_key will enable reverse proxying, point Glance's entry in the
+      Keystone catalog to use https, and override any certficiate and key
+      issued by Keystone (if it is configured to do so).
+  ssl_key:
+    type: string
+    description: SSL key to use with certificate specified as ssl_cert.
+  ssl_ca:
+    type: string
+    description: |
+      SSL CA to use with the certificate and key provided - this is only
+      required if you are providing a privately signed ssl_cert and ssl_key.
+  config-flags:
+    type: string
+    description: Comma separated list of key=value config flags to be set in cinder.conf.
+

=== added symlink 'hooks/amqp-relation-departed'
=== target is u'cinder_hooks.py'
=== modified file 'hooks/charmhelpers/contrib/hahelpers/apache.py'
--- hooks/charmhelpers/contrib/hahelpers/apache.py	2013-10-17 21:48:08 +0000
+++ hooks/charmhelpers/contrib/hahelpers/apache.py	2014-04-16 08:36:27 +0000
@@ -39,14 +39,15 @@
 
 
 def get_ca_cert():
-    ca_cert = None
-    log("Inspecting identity-service relations for CA SSL certificate.",
-        level=INFO)
-    for r_id in relation_ids('identity-service'):
-        for unit in relation_list(r_id):
-            if not ca_cert:
-                ca_cert = relation_get('ca_cert',
-                                       rid=r_id, unit=unit)
+    ca_cert = config_get('ssl_ca')
+    if ca_cert is None:
+        log("Inspecting identity-service relations for CA SSL certificate.",
+            level=INFO)
+        for r_id in relation_ids('identity-service'):
+            for unit in relation_list(r_id):
+                if ca_cert is None:
+                    ca_cert = relation_get('ca_cert',
+                                           rid=r_id, unit=unit)
     return ca_cert
 
 

=== modified file 'hooks/charmhelpers/contrib/openstack/context.py'
--- hooks/charmhelpers/contrib/openstack/context.py	2014-03-25 12:26:41 +0000
+++ hooks/charmhelpers/contrib/openstack/context.py	2014-04-16 08:36:27 +0000
@@ -1,5 +1,6 @@
 import json
 import os
+import time
 
 from base64 import b64decode
 
@@ -113,7 +114,8 @@
 class SharedDBContext(OSContextGenerator):
     interfaces = ['shared-db']
 
-    def __init__(self, database=None, user=None, relation_prefix=None):
+    def __init__(self,
+                 database=None, user=None, relation_prefix=None, ssl_dir=None):
         '''
         Allows inspecting relation for settings prefixed with relation_prefix.
         This is useful for parsing access for multiple databases returned via
@@ -122,6 +124,7 @@
         self.relation_prefix = relation_prefix
         self.database = database
         self.user = user
+        self.ssl_dir = ssl_dir
 
     def __call__(self):
         self.database = self.database or config('database')
@@ -139,17 +142,72 @@
 
         for rid in relation_ids('shared-db'):
             for unit in related_units(rid):
-                passwd = relation_get(password_setting, rid=rid, unit=unit)
+                rdata = relation_get(rid=rid, unit=unit)
                 ctxt = {
-                    'database_host': relation_get('db_host', rid=rid,
-                                                  unit=unit),
+                    'database_host': rdata.get('db_host'),
                     'database': self.database,
                     'database_user': self.user,
-                    'database_password': passwd,
-                }
-                if context_complete(ctxt):
-                    return ctxt
-        return {}
+                    'database_password': rdata.get(password_setting),
+                    'database_type': 'mysql'
+                }
+                if context_complete(ctxt):
+                    db_ssl(rdata, ctxt, self.ssl_dir)
+                    return ctxt
+        return {}
+
+
+class PostgresqlDBContext(OSContextGenerator):
+    interfaces = ['pgsql-db']
+
+    def __init__(self, database=None):
+        self.database = database
+
+    def __call__(self):
+        self.database = self.database or config('database')
+        if self.database is None:
+            log('Could not generate postgresql_db context. '
+                'Missing required charm config options. '
+                '(database name)')
+            raise OSContextError
+        ctxt = {}
+
+        for rid in relation_ids(self.interfaces[0]):
+            for unit in related_units(rid):
+                ctxt = {
+                    'database_host': relation_get('host', rid=rid, unit=unit),
+                    'database': self.database,
+                    'database_user': relation_get('user', rid=rid, unit=unit),
+                    'database_password': relation_get('password', rid=rid, unit=unit),
+                    'database_type': 'postgresql',
+                }
+                if context_complete(ctxt):
+                    return ctxt
+        return {}
+
+
+def db_ssl(rdata, ctxt, ssl_dir):
+    if 'ssl_ca' in rdata and ssl_dir:
+        ca_path = os.path.join(ssl_dir, 'db-client.ca')
+        with open(ca_path, 'w') as fh:
+            fh.write(b64decode(rdata['ssl_ca']))
+        ctxt['database_ssl_ca'] = ca_path
+    elif 'ssl_ca' in rdata:
+        log("Charm not setup for ssl support but ssl ca found")
+        return ctxt
+    if 'ssl_cert' in rdata:
+        cert_path = os.path.join(
+            ssl_dir, 'db-client.cert')
+        if not os.path.exists(cert_path):
+            log("Waiting 1m for ssl client cert validity")
+            time.sleep(60)
+        with open(cert_path, 'w') as fh:
+            fh.write(b64decode(rdata['ssl_cert']))
+        ctxt['database_ssl_cert'] = cert_path
+        key_path = os.path.join(ssl_dir, 'db-client.key')
+        with open(key_path, 'w') as fh:
+            fh.write(b64decode(rdata['ssl_key']))
+        ctxt['database_ssl_key'] = key_path
+    return ctxt
 
 
 class IdentityServiceContext(OSContextGenerator):
@@ -161,24 +219,25 @@
 
         for rid in relation_ids('identity-service'):
             for unit in related_units(rid):
+                rdata = relation_get(rid=rid, unit=unit)
                 ctxt = {
-                    'service_port': relation_get('service_port', rid=rid,
-                                                 unit=unit),
-                    'service_host': relation_get('service_host', rid=rid,
-                                                 unit=unit),
-                    'auth_host': relation_get('auth_host', rid=rid, unit=unit),
-                    'auth_port': relation_get('auth_port', rid=rid, unit=unit),
-                    'admin_tenant_name': relation_get('service_tenant',
-                                                      rid=rid, unit=unit),
-                    'admin_user': relation_get('service_username', rid=rid,
-                                               unit=unit),
-                    'admin_password': relation_get('service_password', rid=rid,
-                                                   unit=unit),
-                    # XXX: Hard-coded http.
-                    'service_protocol': 'http',
-                    'auth_protocol': 'http',
+                    'service_port': rdata.get('service_port'),
+                    'service_host': rdata.get('service_host'),
+                    'auth_host': rdata.get('auth_host'),
+                    'auth_port': rdata.get('auth_port'),
+                    'admin_tenant_name': rdata.get('service_tenant'),
+                    'admin_user': rdata.get('service_username'),
+                    'admin_password': rdata.get('service_password'),
+                    'service_protocol':
+                    rdata.get('service_protocol') or 'http',
+                    'auth_protocol':
+                    rdata.get('auth_protocol') or 'http',
                 }
                 if context_complete(ctxt):
+                    # NOTE(jamespage) this is required for >= icehouse
+                    # so a missing value just indicates keystone needs
+                    # upgrading
+                    ctxt['admin_tenant_id'] = rdata.get('service_tenant_id')
                     return ctxt
         return {}
 
@@ -186,6 +245,9 @@
 class AMQPContext(OSContextGenerator):
     interfaces = ['amqp']
 
+    def __init__(self, ssl_dir=None):
+        self.ssl_dir = ssl_dir
+
     def __call__(self):
         log('Generating template context for amqp')
         conf = config()
@@ -196,7 +258,6 @@
             log('Could not generate shared_db context. '
                 'Missing required charm config options: %s.' % e)
             raise OSContextError
-
         ctxt = {}
         for rid in relation_ids('amqp'):
             ha_vip_only = False
@@ -214,6 +275,14 @@
                                                       unit=unit),
                     'rabbitmq_virtual_host': vhost,
                 })
+
+                ssl_port = relation_get('ssl_port', rid=rid, unit=unit)
+                if ssl_port:
+                    ctxt['rabbit_ssl_port'] = ssl_port
+                ssl_ca = relation_get('ssl_ca', rid=rid, unit=unit)
+                if ssl_ca:
+                    ctxt['rabbit_ssl_ca'] = ssl_ca
+
                 if relation_get('ha_queues', rid=rid, unit=unit) is not None:
                     ctxt['rabbitmq_ha_queues'] = True
 
@@ -221,6 +290,16 @@
                                            rid=rid, unit=unit) is not None
 
                 if context_complete(ctxt):
+                    if 'rabbit_ssl_ca' in ctxt:
+                        if not self.ssl_dir:
+                            log(("Charm not setup for ssl support "
+                                 "but ssl ca found"))
+                            break
+                        ca_path = os.path.join(
+                            self.ssl_dir, 'rabbit-client-ca.pem')
+                        with open(ca_path, 'w') as fh:
+                            fh.write(b64decode(ctxt['rabbit_ssl_ca']))
+                            ctxt['rabbit_ssl_ca'] = ca_path
                     # Sufficient information found = break out!
                     break
             # Used for active/active rabbitmq >= grizzly
@@ -391,6 +470,8 @@
             'private_address': unit_get('private-address'),
             'endpoints': []
         }
+        if is_clustered():
+            ctxt['private_address'] = config('vip')
         for api_port in self.external_ports:
             ext_port = determine_apache_port(api_port)
             int_port = determine_api_port(api_port)

=== modified file 'hooks/charmhelpers/contrib/openstack/neutron.py'
--- hooks/charmhelpers/contrib/openstack/neutron.py	2014-03-25 12:26:41 +0000
+++ hooks/charmhelpers/contrib/openstack/neutron.py	2014-04-16 08:36:27 +0000
@@ -17,6 +17,8 @@
     kver = check_output(['uname', '-r']).strip()
     return 'linux-headers-%s' % kver
 
+QUANTUM_CONF_DIR = '/etc/quantum'
+
 
 def kernel_version():
     """ Retrieve the current major kernel version as a tuple e.g. (3, 13) """
@@ -35,6 +37,8 @@
 
 
 # legacy
+
+
 def quantum_plugins():
     from charmhelpers.contrib.openstack import context
     return {
@@ -46,7 +50,8 @@
             'contexts': [
                 context.SharedDBContext(user=config('neutron-database-user'),
                                         database=config('neutron-database'),
-                                        relation_prefix='neutron')],
+                                        relation_prefix='neutron',
+                                        ssl_dir=QUANTUM_CONF_DIR)],
             'services': ['quantum-plugin-openvswitch-agent'],
             'packages': [[headers_package()] + determine_dkms_package(),
                          ['quantum-plugin-openvswitch-agent']],
@@ -61,7 +66,8 @@
             'contexts': [
                 context.SharedDBContext(user=config('neutron-database-user'),
                                         database=config('neutron-database'),
-                                        relation_prefix='neutron')],
+                                        relation_prefix='neutron',
+                                        ssl_dir=QUANTUM_CONF_DIR)],
             'services': [],
             'packages': [],
             'server_packages': ['quantum-server',
@@ -70,6 +76,8 @@
         }
     }
 
+NEUTRON_CONF_DIR = '/etc/neutron'
+
 
 def neutron_plugins():
     from charmhelpers.contrib.openstack import context
@@ -83,7 +91,8 @@
             'contexts': [
                 context.SharedDBContext(user=config('neutron-database-user'),
                                         database=config('neutron-database'),
-                                        relation_prefix='neutron')],
+                                        relation_prefix='neutron',
+                                        ssl_dir=NEUTRON_CONF_DIR)],
             'services': ['neutron-plugin-openvswitch-agent'],
             'packages': [[headers_package()] + determine_dkms_package(),
                          ['neutron-plugin-openvswitch-agent']],
@@ -98,7 +107,8 @@
             'contexts': [
                 context.SharedDBContext(user=config('neutron-database-user'),
                                         database=config('neutron-database'),
-                                        relation_prefix='neutron')],
+                                        relation_prefix='neutron',
+                                        ssl_dir=NEUTRON_CONF_DIR)],
             'services': [],
             'packages': [],
             'server_packages': ['neutron-server',

=== modified file 'hooks/charmhelpers/contrib/openstack/utils.py'
--- hooks/charmhelpers/contrib/openstack/utils.py	2014-03-25 12:26:41 +0000
+++ hooks/charmhelpers/contrib/openstack/utils.py	2014-04-16 08:36:27 +0000
@@ -65,6 +65,7 @@
     ('1.10.0', 'havana'),
     ('1.9.1', 'havana'),
     ('1.9.0', 'havana'),
+    ('1.13.1', 'icehouse'),
     ('1.13.0', 'icehouse'),
     ('1.12.0', 'icehouse'),
     ('1.11.0', 'icehouse'),

=== modified file 'hooks/charmhelpers/contrib/storage/linux/utils.py'
--- hooks/charmhelpers/contrib/storage/linux/utils.py	2014-03-25 12:26:41 +0000
+++ hooks/charmhelpers/contrib/storage/linux/utils.py	2014-04-16 08:36:27 +0000
@@ -2,7 +2,9 @@
 from stat import S_ISBLK
 
 from subprocess import (
-    check_call
+    check_call,
+    check_output,
+    call
 )
 
 
@@ -22,5 +24,12 @@
 
     :param block_device: str: Full path of block device to clean.
     '''
-    check_call(['sgdisk', '--zap-all', '--clear',
-                '--mbrtogpt', block_device])
+    # sometimes sgdisk exits non-zero; this is OK, dd will clean up
+    call(['sgdisk', '--zap-all', '--mbrtogpt',
+          '--clear', block_device])
+    dev_end = check_output(['blockdev', '--getsz', block_device])
+    gpt_end = int(dev_end.split()[0]) - 100
+    check_call(['dd', 'if=/dev/zero', 'of=%s'%(block_device),
+                'bs=1M', 'count=1'])
+    check_call(['dd', 'if=/dev/zero', 'of=%s'%(block_device),
+                'bs=512', 'count=100', 'seek=%s'%(gpt_end)])

=== modified file 'hooks/cinder_contexts.py'
--- hooks/cinder_contexts.py	2014-03-13 15:50:49 +0000
+++ hooks/cinder_contexts.py	2014-04-16 08:36:27 +0000
@@ -2,6 +2,8 @@
     config,
     relation_ids,
     service_name,
+    related_units,
+    relation_get,
 )
 
 from charmhelpers.contrib.openstack.context import (
@@ -9,6 +11,10 @@
     ApacheSSLContext as SSLContext,
 )
 
+from charmhelpers.contrib.openstack.utils import (
+    get_os_codename_install_source
+)
+
 from charmhelpers.contrib.hahelpers.cluster import (
     determine_apache_port,
     determine_api_port,
@@ -35,8 +41,13 @@
         if not relation_ids('ceph'):
             return {}
         service = service_name()
+        if get_os_codename_install_source(config('openstack-origin')) \
+                >= "icehouse":
+            volume_driver = 'cinder.volume.drivers.rbd.RBDDriver'
+        else:
+            volume_driver = 'cinder.volume.driver.RBDDriver'
         return {
-            'volume_driver': 'cinder.volume.driver.RBDDriver',
+            'volume_driver': volume_driver,
             # ensure_ceph_pool() creates pool based on service name.
             'rbd_pool': service,
             'rbd_user': service,
@@ -74,3 +85,25 @@
         if not service_enabled('cinder-api'):
             return {}
         return super(ApacheSSLContext, self).__call__()
+
+
+class StorageBackendContext(OSContextGenerator):
+    interfaces = ['storage-backend']
+
+    def __call__(self):
+        backends = []
+        for rid in relation_ids('storage-backend'):
+            for unit in related_units(rid):
+                backend_name = relation_get('backend_name',
+                                            unit, rid)
+                if backend_name:
+                    backends.append(backend_name)
+        if len(backends) > 0:
+            return {'backends': ",".join(backends)}
+        else:
+            return {}
+
+
+class LoggingConfigContext(OSContextGenerator):
+    def __call__(self):
+        return {'debug': config('debug'), 'verbose': config('verbose')}

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2014-03-13 15:50:49 +0000
+++ hooks/cinder_hooks.py	2014-04-16 08:36:27 +0000
@@ -2,18 +2,17 @@
 
 import os
 import sys
+import uuid
 
 from subprocess import check_call
 
 from cinder_utils import (
-    clean_storage,
     determine_packages,
     do_openstack_upgrade,
-    ensure_block_device,
     ensure_ceph_pool,
     juju_log,
     migrate_database,
-    prepare_lvm_storage,
+    configure_lvm_storage,
     register_configs,
     restart_map,
     service_enabled,
@@ -28,11 +27,14 @@
     Hooks,
     UnregisteredHookError,
     config,
+    is_relation_made,
     relation_get,
     relation_ids,
     relation_set,
     service_name,
     unit_get,
+    log,
+    ERROR
 )
 
 from charmhelpers.fetch import apt_install, apt_update
@@ -69,32 +71,56 @@
     apt_update()
     apt_install(determine_packages(), fatal=True)
 
-    if (service_enabled('volume') and
-       conf['block-device'] not in [None, 'None', 'none']):
-        bdev = ensure_block_device(conf['block-device'])
-        juju_log('Located valid block device: %s' % bdev)
-        if conf['overwrite'] in ['true', 'True', True]:
-            juju_log('Ensuring block device is clean: %s' % bdev)
-            clean_storage(bdev)
-        prepare_lvm_storage(bdev, conf['volume-group'])
-
 
 @hooks.hook('config-changed')
 @restart_on_change(restart_map(), stopstart=True)
 def config_changed():
+    conf = config()
+    if (service_enabled('volume') and
+            conf['block-device'] not in [None, 'None', 'none']):
+        block_devices = conf['block-device'].split()
+        configure_lvm_storage(block_devices,
+                              conf['volume-group'],
+                              conf['overwrite'] in ['true', 'True', True])
+
     if openstack_upgrade_available('cinder-common'):
         do_openstack_upgrade(configs=CONFIGS)
+        # NOTE(jamespage) tell any storage-backends we just upgraded
+        for rid in relation_ids('storage-backend'):
+            relation_set(relation_id=rid,
+                         upgrade_nonce=uuid.uuid4())
+
     CONFIGS.write_all()
     configure_https()
 
 
 @hooks.hook('shared-db-relation-joined')
 def db_joined():
+    if is_relation_made('pgsql-db'):
+        # error, postgresql is used
+        e = ('Attempting to associate a mysql database when there is already '
+             'associated a postgresql one')
+        log(e, level=ERROR)
+        raise Exception(e)
+
     conf = config()
     relation_set(database=conf['database'], username=conf['database-user'],
                  hostname=unit_get('private-address'))
 
 
[e-mail]('pgsql-db-relation-joined')
+def pgsql_db_joined():
+    if is_relation_made('shared-db'):
+        # raise error
+        e = ('Attempting to associate a postgresql database when there is'
+             ' already associated a mysql one')
+        log(e, level=ERROR)
+        raise Exception(e)
+
+    conf = config()
+    relation_set(database=conf['database'])
+
+
 @hooks.hook('shared-db-relation-changed')
 @restart_on_change(restart_map())
 def db_changed():
@@ -107,6 +133,18 @@
         migrate_database()
 
 
[e-mail]('pgsql-db-relation-changed')
+@restart_on_change(restart_map())
+def pgsql_db_changed():
+    if 'pgsql-db' not in CONFIGS.complete_contexts():
+        juju_log('pgsql-db relation incomplete. Peer not ready?')
+        return
+    CONFIGS.write(CINDER_CONF)
+    if eligible_leader(CLUSTER_RES):
+        juju_log('Cluster leader, performing db sync')
+        migrate_database()
+
+
 @hooks.hook('amqp-relation-joined')
 def amqp_joined(relation_id=None):
     conf = config()
@@ -123,6 +161,15 @@
     CONFIGS.write(CINDER_CONF)
 
 
[e-mail]('amqp-relation-departed')
+@restart_on_change(restart_map())
+def amqp_departed():
+    if 'amqp' not in CONFIGS.complete_contexts():
+        juju_log('amqp relation incomplete. Peer not ready?')
+        return
+    CONFIGS.write(CINDER_CONF)
+
+
 @hooks.hook('identity-service-relation-joined')
 def identity_joined(rid=None):
     if not eligible_leader(CLUSTER_RES):
@@ -241,7 +288,8 @@
             'ceph-relation-broken',
             'identity-service-relation-broken',
             'image-service-relation-broken',
-            'shared-db-relation-broken')
+            'shared-db-relation-broken',
+            'pgsql-db-relation-broken')
 @restart_on_change(restart_map(), stopstart=True)
 def relation_broken():
     CONFIGS.write_all()
@@ -271,6 +319,13 @@
         amqp_joined(relation_id=rel_id)
 
 
[e-mail]('storage-backend-relation-changed')
[e-mail]('storage-backend-relation-broken')
+@restart_on_change(restart_map())
+def storage_backend():
+    CONFIGS.write(CINDER_CONF)
+
+
 if __name__ == '__main__':
     try:
         hooks.execute(sys.argv)

=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2014-02-18 12:25:01 +0000
+++ hooks/cinder_utils.py	2014-04-16 08:36:27 +0000
@@ -12,13 +12,16 @@
 )
 
 from charmhelpers.fetch import (
-    apt_install,
+    apt_upgrade,
     apt_update,
+    apt_install
 )
 
 from charmhelpers.core.host import (
     mounts,
     umount,
+    service_stop,
+    service_start,
     mkdir
 )
 
@@ -43,6 +46,7 @@
     deactivate_lvm_volume_group,
     is_lvm_physical_volume,
     remove_lvm_physical_volume,
+    list_lvm_volume_group
 )
 
 from charmhelpers.contrib.storage.linux.loopback import (
@@ -70,6 +74,7 @@
     'python-jinja2',
     'python-keystoneclient',
     'python-mysqldb',
+    'python-psycopg2',
     'qemu-utils',
 ]
 
@@ -86,8 +91,9 @@
 class CinderCharmError(Exception):
     pass
 
-CINDER_CONF = '/etc/cinder/cinder.conf'
-CINDER_API_CONF = '/etc/cinder/api-paste.ini'
+CINDER_CONF_DIR = "/etc/cinder"
+CINDER_CONF = '%s/cinder.conf' % CINDER_CONF_DIR
+CINDER_API_CONF = '%s/api-paste.ini' % CINDER_CONF_DIR
 CEPH_CONF = '/etc/ceph/ceph.conf'
 CHARM_CEPH_CONF = '/var/lib/charm/{}/ceph.conf'
 
@@ -98,6 +104,7 @@
 
 TEMPLATES = 'templates/'
 
+
 def ceph_config_file():
     return CHARM_CEPH_CONF.format(service_name())
 
@@ -105,14 +112,22 @@
 # with file in restart_on_changes()'s service map.
 CONFIG_FILES = OrderedDict([
     (CINDER_CONF, {
-        'hook_contexts': [context.SharedDBContext(),
-                          context.AMQPContext(),
+        'hook_contexts': [context.SharedDBContext(ssl_dir=CINDER_CONF_DIR),
+                          context.PostgresqlDBContext(),
+                          context.AMQPContext(ssl_dir=CINDER_CONF_DIR),
                           context.ImageServiceContext(),
                           context.OSConfigFlagContext(),
                           context.SyslogContext(),
                           cinder_contexts.CephContext(),
                           cinder_contexts.HAProxyContext(),
-                          cinder_contexts.ImageServiceContext()],
+                          cinder_contexts.ImageServiceContext(),
+                          context.SubordinateConfigContext(
+                              interface='storage-backend',
+                              service='cinder',
+                              config_file=CINDER_CONF),
+                          cinder_contexts.StorageBackendContext(),
+                          cinder_contexts.LoggingConfigContext(),
+                          context.IdentityServiceContext()],
         'services': ['cinder-api', 'cinder-volume',
                      'cinder-scheduler', 'haproxy']
     }),
@@ -239,31 +254,69 @@
     return OrderedDict(_map)
 
 
-def prepare_lvm_storage(block_device, volume_group):
-    '''Ensures block_device is initialized as a LVM PV
-    and creates volume_group.
-    Assumes block device is clean and will raise if storage is already
-    initialized as a PV.
-
-    :param block_device: str: Full path to block device to be prepared.
-    :param volume_group: str: Name of volume group to be created with
-                              block_device as backing PV.
-
-    :returns: None or raises CinderCharmError if storage is unclean.
-    '''
-    e = None
-    if is_lvm_physical_volume(block_device):
-        juju_log('ERROR: Could not prepare LVM storage: %s is already '
-                 'initialized as LVM physical device.' % block_device)
-        raise CinderCharmError
-
-    try:
-        create_lvm_physical_volume(block_device)
-        create_lvm_volume_group(volume_group, block_device)
-    except Exception as e:
-        juju_log('Could not prepare LVM storage on %s.' % block_device)
-        juju_log(e)
-        raise CinderCharmError
+def services():
+    ''' Returns a list of services associate with this charm '''
+    _services = []
+    for v in restart_map().values():
+        _services = _services + v
+    return list(set(_services))
+
+
+def extend_lvm_volume_group(volume_group, block_device):
+    '''
+    Extend and LVM volume group onto a given block device.
+
+    Assumes block device has already been initialized as an LVM PV.
+
+    :param volume_group: str: Name of volume group to create.
+    :block_device: str: Full path of PV-initialized block device.
+    '''
+    subprocess.check_call(['vgextend', volume_group, block_device])
+
+
+def configure_lvm_storage(block_devices, volume_group, overwrite=False):
+    ''' Configure LVM storage on the list of block devices provided
+
+    :param block_devices: list: List of whitelisted block devices to detect
+                                and use if found
+    :param overwrite: bool: Scrub any existing block data if block device is
+                            not already in-use
+    '''
+    devices = []
+    for block_device in block_devices:
+        (block_device, size) = _parse_block_device(block_device)
+        if size == 0 and is_block_device(block_device):
+            devices.append(block_device)
+        elif size > 0:
+            devices.append(ensure_loopback_device(block_device, size))
+
+    # NOTE(jamespage)
+    # might need todo an initial one-time scrub on install if need be
+    vg_found = False
+    new_devices = []
+    for device in devices:
+        if (not is_lvm_physical_volume(device) or
+                (is_lvm_physical_volume(device) and
+                 list_lvm_volume_group(device) != volume_group)):
+            # Existing LVM but not part of required VG or new device
+            if overwrite is True:
+                clean_storage(device)
+                new_devices.append(device)
+                create_lvm_physical_volume(device)
+        elif (is_lvm_physical_volume(device) and
+                list_lvm_volume_group(device) == volume_group):
+            # Mark vg as found
+            vg_found = True
+
+    if vg_found is False and len(new_devices) > 0:
+        # Create new volume group from first device
+        create_lvm_volume_group(volume_group, new_devices[0])
+        new_devices.remove(new_devices[0])
+
+    if len(new_devices) > 0:
+        # Extend the volume group as required
+        for new_device in new_devices:
+            extend_lvm_volume_group(volume_group, new_device)
 
 
 def clean_storage(block_device):
@@ -284,25 +337,24 @@
     if is_lvm_physical_volume(block_device):
         deactivate_lvm_volume_group(block_device)
         remove_lvm_physical_volume(block_device)
-    else:
-        zap_disk(block_device)
-
-
-def ensure_block_device(block_device):
-    '''Confirm block_device, create as loopback if necessary.
-
-    :param block_device: str: Full path of block device to ensure.
-
-    :returns: str: Full path of ensured block device.
+
+    zap_disk(block_device)
+
+
+def _parse_block_device(block_device):
+    ''' Parse a block device string and return either the full path
+    to the block device, or the path to a loopback device and its size
+
+    :param: block_device: str: Block device as provided in configuration
+
+    :returns: (str, int): Full path to block device and 0 OR
+                          Full path to loopback device and required size
     '''
     _none = ['None', 'none', None]
-    if (block_device in _none):
-        juju_log('prepare_storage(): Missing required input: '
-                 'block_device=%s.' % block_device)
-        raise CinderCharmError
-
+    if block_device in _none:
+        return (None, 0)
     if block_device.startswith('/dev/'):
-        bdev = block_device
+        return (block_device, 0)
     elif block_device.startswith('/'):
         _bd = block_device.split('|')
         if len(_bd) == 2:
@@ -310,15 +362,9 @@
         else:
             bdev = block_device
             size = DEFAULT_LOOPBACK_SIZE
-        bdev = ensure_loopback_device(bdev, size)
+        return (bdev, size)
     else:
-        bdev = '/dev/%s' % block_device
-
-    if not is_block_device(bdev):
-        juju_log('Failed to locate valid block device at %s' % bdev)
-        raise CinderCharmError
-
-    return bdev
+        return ('/dev/{}'.format(block_device), 0)
 
 
 def migrate_database():
@@ -364,11 +410,15 @@
         '--option', 'Dpkg::Options::=--force-confdef',
     ]
     apt_update()
-    apt_install(packages=determine_packages(), options=dpkg_opts, fatal=True)
+    apt_upgrade(options=dpkg_opts, fatal=True, dist=True)
+    apt_install(determine_packages(), fatal=True)
 
     # set CONFIGS to load templates from new release and regenerate config
     configs.set_release(openstack_release=new_os_rel)
     configs.write_all()
 
+    # Stop/start services and migrate DB if leader
+    [service_stop(s) for s in services()]
     if eligible_leader(CLUSTER_RES):
         migrate_database()
+    [service_start(s) for s in services()]

=== added symlink 'hooks/pgsql-db-relation-broken'
=== target is u'cinder_hooks.py'
=== added symlink 'hooks/pgsql-db-relation-changed'
=== target is u'cinder_hooks.py'
=== added symlink 'hooks/pgsql-db-relation-joined'
=== target is u'cinder_hooks.py'
=== added symlink 'hooks/storage-backend-relation-broken'
=== target is u'cinder_hooks.py'
=== added symlink 'hooks/storage-backend-relation-changed'
=== target is u'cinder_hooks.py'
=== added symlink 'hooks/storage-backend-relation-departed'
=== target is u'cinder_hooks.py'
=== added symlink 'hooks/storage-backend-relation-joined'
=== target is u'cinder_hooks.py'
=== modified file 'metadata.yaml'
--- metadata.yaml	2013-10-17 21:48:08 +0000
+++ metadata.yaml	2014-04-16 08:36:27 +0000
@@ -11,6 +11,8 @@
 requires:
   shared-db:
     interface: mysql-shared
+  pgsql-db:
+    interface: pgsql
   amqp:
     interface: rabbitmq
   identity-service:
@@ -22,6 +24,9 @@
   ha:
     interface: hacluster
     scope: container
+  storage-backend:
+    interface: cinder-backend
+    scope: container
 peers:
   cluster:
     interface: cinder-ha

=== modified file 'revision'
--- revision	2014-03-25 18:44:23 +0000
+++ revision	2014-04-16 08:36:27 +0000
@@ -1,1 +1,1 @@
-135
+136

=== modified file 'setup.cfg'
--- setup.cfg	2013-10-19 16:59:05 +0000
+++ setup.cfg	2014-04-16 08:36:27 +0000
@@ -1,6 +1,5 @@
 [nosetests]
-verbosity=1
+verbosity=2
 with-coverage=1
 cover-erase=1
 cover-package=hooks
-

=== modified file 'templates/cinder.conf'
--- templates/cinder.conf	2014-02-03 10:44:24 +0000
+++ templates/cinder.conf	2014-04-16 08:36:27 +0000
@@ -9,37 +9,50 @@
 iscsi_helper = tgtadm
 volume_name_template = volume-%s
 volume_group = cinder-volumes
-verbose = True
+verbose = {{ verbose }}
+debug = {{ debug }}
 use_syslog = {{ use_syslog }}
 auth_strategy = keystone
 state_path = /var/lib/cinder
 lock_path = /var/lock/cinder
 volumes_dir = /var/lib/cinder/volumes
-{% if database_host -%}
-sql_connection = mysql://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}
-{% endif -%}
-{% if rabbitmq_host -%}
+
+{% include "parts/database" %}
+
+{% if rabbitmq_host %}
 notification_driver = cinder.openstack.common.notifier.rabbit_notifier
 control_exchange = cinder
+{% if rabbit_ssl_port %}
+rabbit_use_ssl=True
+rabbit_port={{ rabbit_ssl_port }}
+{% if rabbit_ssl_ca %}
+kombu_ssl_ca_certs={{rabbit_ssl_ca}}
+{% endif %}
+{% endif %}
 rabbit_host = {{ rabbitmq_host }}
 rabbit_userid = {{ rabbitmq_user }}
 rabbit_password = {{ rabbitmq_password }}
 rabbit_virtual_host = {{ rabbitmq_virtual_host }}
 {% endif -%}
+
 {% if volume_driver -%}
 volume_driver = {{ volume_driver }}
 {% endif -%}
+
 {% if rbd_pool -%}
 rbd_pool = {{ rbd_pool }}
 host = {{ host }}
 rbd_user = {{ rbd_user }}
 {% endif -%}
+
 {% if osapi_volume_listen_port -%}
 osapi_volume_listen_port = {{ osapi_volume_listen_port }}
 {% endif -%}
+
 {% if glance_api_servers -%}
 glance_api_servers = {{ glance_api_servers }}
 {% endif -%}
+
 {% if glance_api_version -%}
 glance_api_version = {{ glance_api_version }}
 {% endif -%}
@@ -50,3 +63,4 @@
 {% endfor -%}
 {% endif -%}
 
+{% include "parts/backends" %}

=== added file 'templates/grizzly/cinder.conf'
--- templates/grizzly/cinder.conf	1970-01-01 00:00:00 +0000
+++ templates/grizzly/cinder.conf	2014-04-16 08:36:27 +0000
@@ -0,0 +1,57 @@
+###############################################################################
+# [ WARNING ]
+# cinder configuration file maintained by Juju
+# local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+rootwrap_config = /etc/cinder/rootwrap.conf
+api_paste_confg = /etc/cinder/api-paste.ini
+iscsi_helper = tgtadm
+volume_name_template = volume-%s
+volume_group = cinder-volumes
+verbose = {{ verbose }}
+debug = {{ debug }}
+use_syslog = {{ use_syslog }}
+auth_strategy = keystone
+state_path = /var/lib/cinder
+lock_path = /var/lock/cinder
+volumes_dir = /var/lib/cinder/volumes
+
+{% include "parts/database" %}
+
+{% include "parts/rabbitmq" %}
+
+{% if rabbitmq_host or rabbitmq_hosts -%}
+notification_driver = cinder.openstack.common.notifier.rabbit_notifier
+control_exchange = cinder
+{% endif -%}
+
+{% if volume_driver -%}
+volume_driver = {{ volume_driver }}
+{% endif -%}
+
+{% if rbd_pool -%}
+rbd_pool = {{ rbd_pool }}
+host = {{ host }}
+rbd_user = {{ rbd_user }}
+{% endif -%}
+
+{% if osapi_volume_listen_port -%}
+osapi_volume_listen_port = {{ osapi_volume_listen_port }}
+{% endif -%}
+
+{% if glance_api_servers -%}
+glance_api_servers = {{ glance_api_servers }}
+{% endif -%}
+
+{% if glance_api_version -%}
+glance_api_version = {{ glance_api_version }}
+{% endif -%}
+
+{% if user_config_flags -%}
+{% for key, value in user_config_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% include "parts/backends" %}

=== modified file 'templates/havana/api-paste.ini'
--- templates/havana/api-paste.ini	2013-10-17 21:48:08 +0000
+++ templates/havana/api-paste.ini	2014-04-16 08:36:27 +0000
@@ -58,6 +58,9 @@
 [filter:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
 {% if service_host -%}
+service_protocol = {{ service_protocol }}
+service_host = {{ service_host }}
+service_port = {{ service_port }}
 auth_host =  {{ auth_host }}
 auth_port = {{ auth_port }}
 auth_protocol = {{ auth_protocol }}

=== added directory 'templates/icehouse'
=== added file 'templates/icehouse/api-paste.ini'
--- templates/icehouse/api-paste.ini	1970-01-01 00:00:00 +0000
+++ templates/icehouse/api-paste.ini	2014-04-16 08:36:27 +0000
@@ -0,0 +1,55 @@
+#############
+# OpenStack #
+#############
+
+[composite:osapi_volume]
+use = call:cinder.api:root_app_factory
+/: apiversions
+/v1: openstack_volume_api_v1
+/v2: openstack_volume_api_v2
+
+[composite:openstack_volume_api_v1]
+use = call:cinder.api.middleware.auth:pipeline_factory
+noauth = request_id faultwrap sizelimit noauth apiv1
+keystone = request_id faultwrap sizelimit authtoken keystonecontext apiv1
+keystone_nolimit = request_id faultwrap sizelimit authtoken keystonecontext apiv1
+
+[composite:openstack_volume_api_v2]
+use = call:cinder.api.middleware.auth:pipeline_factory
+noauth = request_id faultwrap sizelimit noauth apiv2
+keystone = request_id faultwrap sizelimit authtoken keystonecontext apiv2
+keystone_nolimit = request_id faultwrap sizelimit authtoken keystonecontext apiv2
+
+[filter:request_id]
+paste.filter_factory = cinder.openstack.common.middleware.request_id:RequestIdMiddleware.factory
+
+[filter:faultwrap]
+paste.filter_factory = cinder.api.middleware.fault:FaultWrapper.factory
+
+[filter:noauth]
+paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory
+
+[filter:sizelimit]
+paste.filter_factory = cinder.api.middleware.sizelimit:RequestBodySizeLimiter.factory
+
+[app:apiv1]
+paste.app_factory = cinder.api.v1.router:APIRouter.factory
+
+[app:apiv2]
+paste.app_factory = cinder.api.v2.router:APIRouter.factory
+
+[pipeline:apiversions]
+pipeline = faultwrap osvolumeversionapp
+
+[app:osvolumeversionapp]
+paste.app_factory = cinder.api.versions:Versions.factory
+
+##########
+# Shared #
+##########
+
+[filter:keystonecontext]
+paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
+
+[filter:authtoken]
+paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory

=== added file 'templates/icehouse/cinder.conf'
--- templates/icehouse/cinder.conf	1970-01-01 00:00:00 +0000
+++ templates/icehouse/cinder.conf	2014-04-16 08:36:27 +0000
@@ -0,0 +1,68 @@
+###############################################################################
+# [ WARNING ]
+# cinder configuration file maintained by Juju
+# local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+rootwrap_config = /etc/cinder/rootwrap.conf
+api_paste_confg = /etc/cinder/api-paste.ini
+iscsi_helper = tgtadm
+volume_name_template = volume-%s
+volume_group = cinder-volumes
+verbose = {{ verbose }}
+debug = {{ debug }}
+use_syslog = {{ use_syslog }}
+auth_strategy = keystone
+state_path = /var/lib/cinder
+lock_path = /var/lock/cinder
+volumes_dir = /var/lib/cinder/volumes
+
+{% include "parts/rabbitmq" %}
+
+{% if rabbitmq_host or rabbitmq_hosts -%}
+notification_driver = cinder.openstack.common.notifier.rpc_notifier
+control_exchange = cinder
+{% endif -%}
+
+{% if volume_driver -%}
+volume_driver = {{ volume_driver }}
+{% endif -%}
+
+{% if rbd_pool -%}
+rbd_pool = {{ rbd_pool }}
+host = {{ host }}
+rbd_user = {{ rbd_user }}
+{% endif -%}
+
+{% if osapi_volume_listen_port -%}
+osapi_volume_listen_port = {{ osapi_volume_listen_port }}
+{% endif -%}
+
+{% if glance_api_servers -%}
+glance_api_servers = {{ glance_api_servers }}
+{% endif -%}
+
+{% if glance_api_version -%}
+glance_api_version = {{ glance_api_version }}
+{% endif -%}
+
+{% if user_config_flags -%}
+{% for key, value in user_config_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% include "parts/backends" %}
+
+{% if auth_host -%}
+[keystone_authtoken]
+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
+auth_host = {{ auth_host }}
+auth_port = {{ auth_port }}
+auth_protocol = {{ auth_protocol }}
+admin_tenant_name = {{ admin_tenant_name }}
+admin_user = {{ admin_user }}
+admin_password = {{ admin_password }}
+{% endif -%}
+
+{% include "parts/section-database" %}

=== added directory 'templates/parts'
=== added file 'templates/parts/backends'
--- templates/parts/backends	1970-01-01 00:00:00 +0000
+++ templates/parts/backends	2014-04-16 08:36:27 +0000
@@ -0,0 +1,18 @@
+{% if sections and 'DEFAULT' in sections -%}
+{% for key, value in sections['DEFAULT'] -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+
+{% if backends -%}
+enabled_backends = {{ backends }}
+{% endif -%}
+
+{% for section in sections -%}
+{% if section != 'DEFAULT' -%}
+[{{ section }}]
+{% for key, value in sections[section] -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+{% endfor -%}
\ No newline at end of file

=== added file 'templates/parts/database'
--- templates/parts/database	1970-01-01 00:00:00 +0000
+++ templates/parts/database	2014-04-16 08:36:27 +0000
@@ -0,0 +1,3 @@
+{% if database_host -%}
+sql_connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
+{% endif -%}

=== added file 'templates/parts/rabbitmq'
--- templates/parts/rabbitmq	1970-01-01 00:00:00 +0000
+++ templates/parts/rabbitmq	2014-04-16 08:36:27 +0000
@@ -0,0 +1,21 @@
+{% if rabbitmq_host or rabbitmq_hosts -%}
+rabbit_userid = {{ rabbitmq_user }}
+rabbit_virtual_host = {{ rabbitmq_virtual_host }}
+rabbit_password = {{ rabbitmq_password }}
+{% if rabbitmq_hosts -%}
+rabbit_hosts = {{ rabbitmq_hosts }}
+{% if rabbitmq_ha_queues -%}
+rabbit_ha_queues = True
+rabbit_durable_queues = False
+{% endif -%}
+{% else -%}
+rabbit_host = {{ rabbitmq_host }}
+{% endif -%}
+{% if rabbit_ssl_port -%}
+rabbit_use_ssl = True
+rabbit_port = {{ rabbit_ssl_port }}
+{% if rabbit_ssl_ca -%}
+kombu_ssl_ca_certs = {{ rabbit_ssl_ca }}
+{% endif -%}
+{% endif -%}
+{% endif -%}
\ No newline at end of file

=== added file 'templates/parts/section-database'
--- templates/parts/section-database	1970-01-01 00:00:00 +0000
+++ templates/parts/section-database	2014-04-16 08:36:27 +0000
@@ -0,0 +1,4 @@
+{% if database_host -%}
+[database]
+connection = {{ database_type }}://{{ database_user }}:{{ database_password }}@{{ database_host }}/{{ database }}{% if database_ssl_ca %}?ssl_ca={{ database_ssl_ca }}{% if database_ssl_cert %}&ssl_cert={{ database_ssl_cert }}&ssl_key={{ database_ssl_key }}{% endif %}{% endif %}
+{% endif -%}

=== modified file 'unit_tests/test_cinder_contexts.py'
--- unit_tests/test_cinder_contexts.py	2014-03-13 15:50:49 +0000
+++ unit_tests/test_cinder_contexts.py	2014-04-16 08:36:27 +0000
@@ -16,10 +16,14 @@
     'service_name',
     'determine_apache_port',
     'determine_api_port',
+    'get_os_codename_install_source',
+    'related_units',
+    'relation_get'
 ]
 
 
 class TestCinderContext(CharmTestCase):
+
     def setUp(self):
         super(TestCinderContext, self).setUp(contexts, TO_PATCH)
 
@@ -45,6 +49,7 @@
 
     def test_ceph_related(self):
         self.relation_ids.return_value = ['ceph:0']
+        self.get_os_codename_install_source.return_value = 'havana'
         service = 'mycinder'
         self.service_name.return_value = service
         self.assertEquals(
@@ -54,11 +59,43 @@
              'rbd_user': service,
              'host': service})
 
+    def test_ceph_related_icehouse(self):
+        self.relation_ids.return_value = ['ceph:0']
+        self.get_os_codename_install_source.return_value = 'icehouse'
+        service = 'mycinder'
+        self.service_name.return_value = service
+        self.assertEquals(
+            contexts.CephContext()(),
+            {'volume_driver': 'cinder.volume.drivers.rbd.RBDDriver',
+             'rbd_pool': service,
+             'rbd_user': service,
+             'host': service})
+
     @patch.object(utils, 'service_enabled')
     def test_apache_ssl_context_service_disabled(self, service_enabled):
         service_enabled.return_value = False
         self.assertEquals(contexts.ApacheSSLContext()(), {})
 
+    def test_storage_backend_no_backends(self):
+        self.relation_ids.return_value = []
+        self.assertEquals(contexts.StorageBackendContext()(), {})
+
+    def test_storage_backend_single_backend(self):
+        self.relation_ids.return_value = ['cinder-ceph:0']
+        self.related_units.return_value = ['cinder-ceph/0']
+        self.relation_get.return_value = 'cinder-ceph'
+        self.assertEquals(contexts.StorageBackendContext()(),
+                          {'backends': 'cinder-ceph'})
+
+    def test_storage_backend_multi_backend(self):
+        self.relation_ids.return_value = ['cinder-ceph:0', 'cinder-vmware:0']
+        self.related_units.side_effect = [['cinder-ceph/0'],
+                                          ['cinder-vmware/0']]
+        self.relation_get.side_effect = ['cinder-ceph', 'cinder-vmware']
+        self.assertEquals(contexts.StorageBackendContext()(),
+                          {'backends': 'cinder-ceph,cinder-vmware'})
+
+    @patch('charmhelpers.contrib.openstack.context.is_clustered')
     @patch('charmhelpers.contrib.openstack.context.determine_apache_port')
     @patch('charmhelpers.contrib.openstack.context.determine_api_port')
     @patch('charmhelpers.contrib.openstack.context.unit_get')
@@ -67,15 +104,17 @@
     def test_apache_ssl_context_service_enabled(self, service_enabled,
                                                 mock_https, mock_unit_get,
                                                 mock_determine_api_port,
-                                                mock_determine_apache_port):
+                                                mock_determine_apache_port,
+                                                mock_is_clustered):
         mock_https.return_value = True
         mock_unit_get.return_value = '1.2.3.4'
         mock_determine_api_port.return_value = '12'
         mock_determine_apache_port.return_value = '34'
+        mock_is_clustered.return_value = False
 
         ctxt = contexts.ApacheSSLContext()
-        with patch.object(ctxt, 'enable_modules') as mock_enable_modules:
-            with patch.object(ctxt, 'configure_cert') as mock_configure_cert:
+        with patch.object(ctxt, 'enable_modules'):
+            with patch.object(ctxt, 'configure_cert'):
                 service_enabled.return_value = False
                 self.assertEquals(ctxt(), {})
                 self.assertFalse(mock_https.called)

=== modified file 'unit_tests/test_cinder_hooks.py'
--- unit_tests/test_cinder_hooks.py	2014-02-18 12:25:57 +0000
+++ unit_tests/test_cinder_hooks.py	2014-04-16 08:36:27 +0000
@@ -24,16 +24,15 @@
 TO_PATCH = [
     'check_call',
     # cinder_utils
-    'clean_storage',
+    'configure_lvm_storage',
     'determine_packages',
     'do_openstack_upgrade',
-    'ensure_block_device',
     'ensure_ceph_keyring',
     'ensure_ceph_pool',
     'juju_log',
+    'log',
     'lsb_release',
     'migrate_database',
-    'prepare_lvm_storage',
     'register_configs',
     'restart_map',
     'service_enabled',
@@ -43,6 +42,7 @@
     'ceph_config_file',
     # charmhelpers.core.hookenv
     'config',
+    'is_relation_made',
     'relation_get',
     'relation_ids',
     'relation_set',
@@ -64,6 +64,7 @@
 
 
 class TestInstallHook(CharmTestCase):
+
     def setUp(self):
         super(TestInstallHook, self).setUp(hooks, TO_PATCH)
         self.config.side_effect = self.test_config.get_all
@@ -81,46 +82,9 @@
         hooks.hooks.execute(['hooks/install'])
         self.apt_install.assert_called_with(['foo', 'bar', 'baz'], fatal=True)
 
-    def test_storage_prepared(self):
-        'It prepares local storage if volume service enabled'
-        self.test_config.set('block-device', 'vdb')
-        self.test_config.set('volume-group', 'cinder')
-        self.test_config.set('overwrite', 'true')
-        self.service_enabled.return_value = True
-        self.ensure_block_device.return_value = '/dev/vdb'
-        hooks.hooks.execute(['hooks/install'])
-        self.ensure_block_device.assert_called_with('vdb')
-        self.prepare_lvm_storage.assert_called_with('/dev/vdb', 'cinder')
-
-    def test_storage_not_prepared(self):
-        'It does not prepare storage when not necessary'
-        self.service_enabled.return_value = False
-        hooks.hooks.execute(['hooks/install'])
-        self.assertFalse(self.ensure_block_device.called)
-        self.service_enabled.return_value = True
-        for none in ['None', 'none', None]:
-            self.test_config.set('block-device', none)
-            hooks.hooks.execute(['hooks/install'])
-            self.assertFalse(self.ensure_block_device.called)
-
-    def test_storage_is_cleaned(self):
-        'It cleans storage when configured to do so'
-        self.ensure_block_device.return_value = '/dev/foo'
-        for true in ['True', 'true', True]:
-            self.test_config.set('overwrite', true)
-            hooks.hooks.execute(['hooks/install'])
-            self.clean_storage.assert_called_with('/dev/foo')
-
-    def test_storage_is_not_cleaned(self):
-        'It does not clean storage when not configured to'
-        self.ensure_block_device.return_value = '/dev/foo'
-        for true in ['False', 'false', False]:
-            self.test_config.set('overwrite', true)
-            hooks.hooks.execute(['hooks/install'])
-            self.assertFalse(self.clean_storage.called)
-
 
 class TestChangedHooks(CharmTestCase):
+
     def setUp(self):
         super(TestChangedHooks, self).setUp(hooks, TO_PATCH)
         self.config.side_effect = self.test_config.get_all
@@ -144,6 +108,24 @@
         hooks.hooks.execute(['hooks/config-changed'])
         self.assertTrue(self.CONFIGS.write_all.called)
         self.assertTrue(conf_https.called)
+        self.configure_lvm_storage.assert_called_with(['sdb'],
+                                                      'cinder-volumes',
+                                                      False)
+
+    @patch.object(hooks, 'configure_https')
+    def test_config_changed_block_devices(self, conf_https):
+        'It writes out all config'
+        self.openstack_upgrade_available.return_value = False
+        self.test_config.set('block-device', 'sdb /dev/sdc sde')
+        self.test_config.set('volume-group', 'cinder-new')
+        self.test_config.set('overwrite', 'True')
+        hooks.hooks.execute(['hooks/config-changed'])
+        self.assertTrue(self.CONFIGS.write_all.called)
+        self.assertTrue(conf_https.called)
+        self.configure_lvm_storage.assert_called_with(
+            ['sdb', '/dev/sdc', 'sde'],
+            'cinder-new',
+            True)
 
     @patch.object(hooks, 'configure_https')
     def test_config_changed_upgrade_available(self, conf_https):
@@ -159,12 +141,25 @@
         self.CONFIGS.write.assert_called_with('/etc/cinder/cinder.conf')
         self.assertTrue(self.migrate_database.called)
 
+    def test_pgsql_db_changed(self):
+        'It writes out cinder.conf on db changed'
+        self.CONFIGS.complete_contexts.return_value = ['pgsql-db']
+        hooks.hooks.execute(['hooks/pgsql-db-relation-changed'])
+        self.CONFIGS.write.assert_called_with('/etc/cinder/cinder.conf')
+        self.assertTrue(self.migrate_database.called)
+
     def test_db_changed_relation_incomplete(self):
         'It does not write out cinder.conf with incomplete shared-db rel'
         hooks.hooks.execute(['hooks/shared-db-relation-changed'])
         self.assertFalse(self.CONFIGS.write.called)
         self.assertFalse(self.migrate_database.called)
 
+    def test_pgsql_db_changed_relation_incomplete(self):
+        'It does not write out cinder.conf with incomplete pgsql-db rel'
+        hooks.hooks.execute(['hooks/pgsql-db-relation-changed'])
+        self.assertFalse(self.CONFIGS.write.called)
+        self.assertFalse(self.migrate_database.called)
+
     def test_db_changed_not_leader(self):
         'It does not migrate database when not leader'
         self.eligible_leader.return_value = False
@@ -173,6 +168,14 @@
         self.CONFIGS.write.assert_called_with('/etc/cinder/cinder.conf')
         self.assertFalse(self.migrate_database.called)
 
+    def test_pgsql_db_changed_not_leader(self):
+        'It does not migrate database when not leader'
+        self.eligible_leader.return_value = False
+        self.CONFIGS.complete_contexts.return_value = ['pgsql-db']
+        hooks.hooks.execute(['hooks/pgsql-db-relation-changed'])
+        self.CONFIGS.write.assert_called_with('/etc/cinder/cinder.conf')
+        self.assertFalse(self.migrate_database.called)
+
     def test_amqp_changed(self):
         'It writes out cinder.conf on amqp changed with complete relation'
         self.CONFIGS.complete_contexts.return_value = ['amqp']
@@ -228,8 +231,17 @@
         hooks.hooks.execute(['hooks/image-service-relation-broken'])
         self.assertTrue(self.CONFIGS.write_all.called)
 
+    def test_storage_backend_changed(self):
+        hooks.hooks.execute(['hooks/storage-backend-relation-changed'])
+        self.CONFIGS.write.assert_called_with(utils.CINDER_CONF)
+
+    def test_storage_backend_broken(self):
+        hooks.hooks.execute(['hooks/storage-backend-relation-broken'])
+        self.CONFIGS.write.assert_called_with(utils.CINDER_CONF)
+
 
 class TestJoinedHooks(CharmTestCase):
+
     def setUp(self):
         super(TestJoinedHooks, self).setUp(hooks, TO_PATCH)
         self.config.side_effect = self.test_config.get_all
@@ -237,11 +249,38 @@
     def test_db_joined(self):
         'It properly requests access to a shared-db service'
         self.unit_get.return_value = 'cindernode1'
+        self.is_relation_made.return_value = False
         hooks.hooks.execute(['hooks/shared-db-relation-joined'])
         expected = {'username': 'cinder',
                     'hostname': 'cindernode1', 'database': 'cinder'}
         self.relation_set.assert_called_with(**expected)
 
+    def test_db_joined_with_postgresql(self):
+        self.is_relation_made.return_value = True
+
+        with self.assertRaises(Exception) as context:
+            hooks.hooks.execute(['hooks/shared-db-relation-joined'])
+        self.assertEqual(context.exception.message,
+                         'Attempting to associate a mysql database when there '
+                         'is already associated a postgresql one')
+
+    def test_postgresql_db_joined(self):
+        'It properly requests access to a postgresql-db service'
+        self.unit_get.return_value = 'cindernode1'
+        self.is_relation_made.return_value = False
+        hooks.hooks.execute(['hooks/pgsql-db-relation-joined'])
+        expected = {'database': 'cinder'}
+        self.relation_set.assert_called_with(**expected)
+
+    def test_postgresql_joined_with_db(self):
+        self.is_relation_made.return_value = True
+
+        with self.assertRaises(Exception) as context:
+            hooks.hooks.execute(['hooks/pgsql-db-relation-joined'])
+        self.assertEqual(context.exception.message,
+                         'Attempting to associate a postgresql database when'
+                         ' there is already associated a mysql one')
+
     def test_amqp_joined(self):
         'It properly requests access to an amqp service'
         hooks.hooks.execute(['hooks/amqp-relation-joined'])
@@ -329,3 +368,21 @@
         self.ensure_ceph_keyring.return_value = True
         hooks.hooks.execute(['hooks/ceph-relation-changed'])
         self.assertFalse(self.ensure_ceph_pool.called)
+
+
+class TestDepartedHooks(CharmTestCase):
+
+    def setUp(self):
+        super(TestDepartedHooks, self).setUp(hooks, TO_PATCH)
+        self.config.side_effect = self.test_config.get_all
+
+    def test_amqp_departed(self):
+        self.CONFIGS.complete_contexts.return_value = ['amqp']
+        hooks.hooks.execute(['hooks/amqp-relation-departed'])
+        self.CONFIGS.write.assert_called_with('/etc/cinder/cinder.conf')
+
+    def test_amqp_departed_incomplete(self):
+        self.CONFIGS.complete_contexts.return_value = []
+        hooks.hooks.execute(['hooks/amqp-relation-departed'])
+        assert not self.CONFIGS.write.called
+        assert self.juju_log.called

=== modified file 'unit_tests/test_cinder_utils.py'
--- unit_tests/test_cinder_utils.py	2014-02-12 10:55:14 +0000
+++ unit_tests/test_cinder_utils.py	2014-04-16 08:36:27 +0000
@@ -26,6 +26,7 @@
     'create_lvm_volume_group',
     'deactivate_lvm_volume_group',
     'is_lvm_physical_volume',
+    'list_lvm_volume_group',
     'relation_ids',
     'remove_lvm_physical_volume',
     'ensure_loopback_device',
@@ -39,7 +40,10 @@
     'install_alternative',
     # fetch
     'apt_update',
+    'apt_upgrade',
     'apt_install',
+    'service_stop',
+    'service_start',
     # cinder
     'ceph_config_file'
 ]
@@ -49,8 +53,14 @@
     ['/mnt', '/dev/vdb']
 ]
 
+DPKG_OPTIONS = [
+    '--option', 'Dpkg::Options::=--force-confnew',
+    '--option', 'Dpkg::Options::=--force-confdef',
+]
+
 
 class TestCinderUtils(CharmTestCase):
+
     def setUp(self):
         super(TestCinderUtils, self).setUp(cinder_utils, TO_PATCH)
         self.config.side_effect = self.test_config.get_all
@@ -109,6 +119,11 @@
                           sorted(common + cinder_utils.API_PACKAGES +
                                  cinder_utils.SCHEDULER_PACKAGES))
 
+    def test_services(self):
+        self.assertEquals(cinder_utils.services(),
+                          ['haproxy', 'apache2', 'cinder-api',
+                           'cinder-volume', 'cinder-scheduler'])
+
     def test_creates_restart_map_all_enabled(self):
         'It creates correct restart map when all services enabled'
         ex_map = OrderedDict([
@@ -157,36 +172,6 @@
         ])
         self.assertEquals(cinder_utils.restart_map(), ex_map)
 
-    def test_ensure_block_device_bad_config(self):
-        "It doesn't prepare storage with bad config"
-        for none in ['None', 'none', None]:
-            self.assertRaises(cinder_utils.CinderCharmError,
-                              cinder_utils.ensure_block_device,
-                              block_device=none)
-
-    def test_ensure_block_device_loopback(self):
-        'It ensures loopback device when checking block device'
-        cinder_utils.ensure_block_device('/tmp/cinder.img')
-        ex_size = cinder_utils.DEFAULT_LOOPBACK_SIZE
-        self.ensure_loopback_device.assert_called_with('/tmp/cinder.img',
-                                                       ex_size)
-
-        cinder_utils.ensure_block_device('/tmp/cinder-2.img|15G')
-        self.ensure_loopback_device.assert_called_with('/tmp/cinder-2.img',
-                                                       '15G')
-
-    def test_ensure_standard_block_device(self):
-        'It looks for storage at both relative and full device path'
-        for dev in ['vdb', '/dev/vdb']:
-            cinder_utils.ensure_block_device(dev)
-            self.is_block_device.assert_called_with('/dev/vdb')
-
-    def test_ensure_nonexistent_block_device(self):
-        'It will not ensure a non-existant block device'
-        self.is_block_device.return_value = False
-        self.assertRaises(cinder_utils.CinderCharmError,
-                          cinder_utils.ensure_block_device, 'foo')
-
     def test_clean_storage_unmount(self):
         'It unmounts block device when cleaning storage'
         self.is_lvm_physical_volume.return_value = False
@@ -202,6 +187,7 @@
         cinder_utils.clean_storage('/dev/vdb')
         self.remove_lvm_physical_volume.assert_called_with('/dev/vdb')
         self.deactivate_lvm_volume_group.assert_called_with('/dev/vdb')
+        self.zap_disk.assert_called_with('/dev/vdb')
 
     def test_clean_storage_zap_disk(self):
         'It removes traces of LVM when cleaning storage'
@@ -210,31 +196,136 @@
         cinder_utils.clean_storage('/dev/vdb')
         self.zap_disk.assert_called_with('/dev/vdb')
 
-    def test_prepare_lvm_storage_not_clean(self):
-        'It errors when prepping non-clean LVM storage'
-        self.is_lvm_physical_volume.return_value = True
-        self.assertRaises(cinder_utils.CinderCharmError,
-                          cinder_utils.prepare_lvm_storage,
-                          block_device='/dev/foobar',
-                          volume_group='bar-vg')
-
-    def test_prepare_lvm_storage_clean(self):
-        self.is_lvm_physical_volume.return_value = False
-        cinder_utils.prepare_lvm_storage(block_device='/dev/foobar',
-                                         volume_group='bar-vg')
-        self.create_lvm_physical_volume.assert_called_with('/dev/foobar')
-        self.create_lvm_volume_group.assert_called_with('bar-vg',
-                                                        '/dev/foobar')
-
-    def test_prepare_lvm_storage_error(self):
-        self.is_lvm_physical_volume.return_value = False
-        self.create_lvm_physical_volume.side_effect = Exception()
-        # NOTE(jamespage) ensure general Exceptions mapped
-        # to CinderCharmError's
-        self.assertRaises(cinder_utils.CinderCharmError,
-                          cinder_utils.prepare_lvm_storage,
-                          block_device='/dev/foobar',
-                          volume_group='bar-vg')
+    def test_parse_block_device(self):
+        self.assertTrue(cinder_utils._parse_block_device(None),
+                        (None, 0))
+        self.assertTrue(cinder_utils._parse_block_device('vdc'),
+                        ('/dev/vdc', 0))
+        self.assertTrue(cinder_utils._parse_block_device('/dev/vdc'),
+                        ('/dev/vdc', 0))
+        self.assertTrue(cinder_utils._parse_block_device('/dev/vdc'),
+                        ('/dev/vdc', 0))
+        self.assertTrue(cinder_utils._parse_block_device('/mnt/loop0|10'),
+                        ('/mnt/loop0', 10))
+        self.assertTrue(cinder_utils._parse_block_device('/mnt/loop0'),
+                        ('/mnt/loop0', cinder_utils.DEFAULT_LOOPBACK_SIZE))
+
+    @patch.object(cinder_utils, 'clean_storage')
+    @patch.object(cinder_utils, 'extend_lvm_volume_group')
+    def test_configure_lvm_storage(self, extend_lvm, clean_storage):
+        devices = ['/dev/vdb', '/dev/vdc']
+        self.is_lvm_physical_volume.return_value = False
+        cinder_utils.configure_lvm_storage(devices, 'test', True)
+        clean_storage.assert_has_calls(
+            [call('/dev/vdb'),
+             call('/dev/vdc')]
+        )
+        self.create_lvm_physical_volume.assert_has_calls(
+            [call('/dev/vdb'),
+             call('/dev/vdc')]
+        )
+        self.create_lvm_volume_group.assert_called_with('test', '/dev/vdb')
+        extend_lvm.assert_called_with('test', '/dev/vdc')
+
+    @patch.object(cinder_utils, 'clean_storage')
+    @patch.object(cinder_utils, 'extend_lvm_volume_group')
+    def test_configure_lvm_storage_loopback(self, extend_lvm, clean_storage):
+        devices = ['/mnt/loop0|10']
+        self.ensure_loopback_device.return_value = '/dev/loop0'
+        self.is_lvm_physical_volume.return_value = False
+        cinder_utils.configure_lvm_storage(devices, 'test', True)
+        clean_storage.assert_called_with('/dev/loop0')
+        self.ensure_loopback_device.assert_called_with('/mnt/loop0', '10')
+        self.create_lvm_physical_volume.assert_called_with('/dev/loop0')
+        self.create_lvm_volume_group.assert_called_with('test', '/dev/loop0')
+        self.assertFalse(extend_lvm.called)
+
+    @patch.object(cinder_utils, 'clean_storage')
+    @patch.object(cinder_utils, 'extend_lvm_volume_group')
+    def test_configure_lvm_storage_existing_vg(self, extend_lvm,
+                                               clean_storage):
+        def pv_lookup(device):
+            devices = {
+                '/dev/vdb': True,
+                '/dev/vdc': False
+            }
+            return devices[device]
+
+        def vg_lookup(device):
+            devices = {
+                '/dev/vdb': 'test',
+                '/dev/vdc': None
+            }
+            return devices[device]
+        devices = ['/dev/vdb', '/dev/vdc']
+        self.is_lvm_physical_volume.side_effect = pv_lookup
+        self.list_lvm_volume_group.side_effect = vg_lookup
+        cinder_utils.configure_lvm_storage(devices, 'test', True)
+        clean_storage.assert_has_calls(
+            [call('/dev/vdc')]
+        )
+        self.create_lvm_physical_volume.assert_has_calls(
+            [call('/dev/vdc')]
+        )
+        extend_lvm.assert_called_with('test', '/dev/vdc')
+        self.assertFalse(self.create_lvm_volume_group.called)
+
+    @patch.object(cinder_utils, 'clean_storage')
+    @patch.object(cinder_utils, 'extend_lvm_volume_group')
+    def test_configure_lvm_storage_different_vg(self, extend_lvm,
+                                                clean_storage):
+        def pv_lookup(device):
+            devices = {
+                '/dev/vdb': True,
+                '/dev/vdc': True
+            }
+            return devices[device]
+
+        def vg_lookup(device):
+            devices = {
+                '/dev/vdb': 'test',
+                '/dev/vdc': 'another'
+            }
+            return devices[device]
+        devices = ['/dev/vdb', '/dev/vdc']
+        self.is_lvm_physical_volume.side_effect = pv_lookup
+        self.list_lvm_volume_group.side_effect = vg_lookup
+        cinder_utils.configure_lvm_storage(devices, 'test', True)
+        clean_storage.assert_called_with('/dev/vdc')
+        self.create_lvm_physical_volume.assert_called_with('/dev/vdc')
+        extend_lvm.assert_called_with('test', '/dev/vdc')
+        self.assertFalse(self.create_lvm_volume_group.called)
+
+    @patch.object(cinder_utils, 'clean_storage')
+    @patch.object(cinder_utils, 'extend_lvm_volume_group')
+    def test_configure_lvm_storage_different_vg_ignore(self, extend_lvm,
+                                                       clean_storage):
+        def pv_lookup(device):
+            devices = {
+                '/dev/vdb': True,
+                '/dev/vdc': True
+            }
+            return devices[device]
+
+        def vg_lookup(device):
+            devices = {
+                '/dev/vdb': 'test',
+                '/dev/vdc': 'another'
+            }
+            return devices[device]
+        devices = ['/dev/vdb', '/dev/vdc']
+        self.is_lvm_physical_volume.side_effect = pv_lookup
+        self.list_lvm_volume_group.side_effect = vg_lookup
+        cinder_utils.configure_lvm_storage(devices, 'test', False)
+        self.assertFalse(clean_storage.called)
+        self.assertFalse(self.create_lvm_physical_volume.called)
+        self.assertFalse(extend_lvm.called)
+        self.assertFalse(self.create_lvm_volume_group.called)
+
+    @patch('subprocess.check_call')
+    def test_extend_lvm_volume_group(self, _call):
+        cinder_utils.extend_lvm_volume_group('test', '/dev/sdb')
+        _call.assert_called_with(['vgextend', 'test', '/dev/sdb'])
 
     def test_migrate_database(self):
         'It migrates database with cinder-manage'
@@ -322,30 +413,40 @@
                     out.write('env CEPH_ARGS="--id %s"\n' % service)
         """
 
+    @patch.object(cinder_utils, 'services')
     @patch.object(cinder_utils, 'migrate_database')
     @patch.object(cinder_utils, 'determine_packages')
-    def test_openstack_upgrade_leader(self, pkgs, migrate):
+    def test_openstack_upgrade_leader(self, pkgs, migrate, services):
         pkgs.return_value = ['mypackage']
         self.config.side_effect = None
         self.config.return_value = 'cloud:precise-havana'
+        services.return_value = ['cinder-api', 'cinder-volume']
         self.eligible_leader.return_value = True
         self.get_os_codename_install_source.return_value = 'havana'
         configs = MagicMock()
         cinder_utils.do_openstack_upgrade(configs)
         self.assertTrue(configs.write_all.called)
+        self.apt_upgrade.assert_called_with(options=DPKG_OPTIONS,
+                                            fatal=True, dist=True)
+        self.apt_install.assert_called_with(['mypackage'], fatal=True)
         configs.set_release.assert_called_with(openstack_release='havana')
         self.assertTrue(migrate.called)
 
+    @patch.object(cinder_utils, 'services')
     @patch.object(cinder_utils, 'migrate_database')
     @patch.object(cinder_utils, 'determine_packages')
-    def test_openstack_upgrade_not_leader(self, pkgs, migrate):
+    def test_openstack_upgrade_not_leader(self, pkgs, migrate, services):
         pkgs.return_value = ['mypackage']
         self.config.side_effect = None
         self.config.return_value = 'cloud:precise-havana'
+        services.return_value = ['cinder-api', 'cinder-volume']
         self.eligible_leader.return_value = False
         self.get_os_codename_install_source.return_value = 'havana'
         configs = MagicMock()
         cinder_utils.do_openstack_upgrade(configs)
         self.assertTrue(configs.write_all.called)
+        self.apt_upgrade.assert_called_with(options=DPKG_OPTIONS,
+                                            fatal=True, dist=True)
+        self.apt_install.assert_called_with(['mypackage'], fatal=True)
         configs.set_release.assert_called_with(openstack_release='havana')
         self.assertFalse(migrate.called)

=== modified file 'unit_tests/test_cluster_hooks.py'
--- unit_tests/test_cluster_hooks.py	2014-03-13 15:50:49 +0000
+++ unit_tests/test_cluster_hooks.py	2014-04-16 08:36:27 +0000
@@ -24,15 +24,13 @@
 
 TO_PATCH = [
     # cinder_utils
-    'clean_storage',
     'determine_packages',
-    'ensure_block_device',
     'ensure_ceph_keyring',
     'ensure_ceph_pool',
     'juju_log',
     'lsb_release',
     'migrate_database',
-    'prepare_lvm_storage',
+    'configure_lvm_storage',
     'register_configs',
     'service_enabled',
     'set_ceph_env_variables',
@@ -58,6 +56,7 @@
 
 
 class TestClusterHooks(CharmTestCase):
+
     def setUp(self):
         super(TestClusterHooks, self).setUp(hooks, TO_PATCH)
         self.config.side_effect = self.test_config.get_all

=== modified file 'unit_tests/test_utils.py'
--- unit_tests/test_utils.py	2014-01-15 15:30:21 +0000
+++ unit_tests/test_utils.py	2014-04-16 08:36:27 +0000
@@ -55,6 +55,7 @@
 
 
 class CharmTestCase(unittest.TestCase):
+
     def setUp(self, obj, patches):
         super(CharmTestCase, self).setUp()
         self.patches = patches
@@ -75,6 +76,7 @@
 
 
 class TestConfig(object):
+
     def __init__(self):
         self.config = get_default_config()
 
@@ -94,6 +96,7 @@
 
 
 class TestRelation(object):
+
     def __init__(self, relation_data={}):
         self.relation_data = relation_data