Merge lp:~hopem/charms/precise/cinder/lp1187123 into lp:~openstack-charmers/charms/precise/cinder/python-redux

[Edward Hope-Morley]

[lp:~hopem/charms/precise/cinder/lp1187123]

65. By Edward Hope-Morley on 2013-09-23

added glance_api_version to cinder.conf template

=== modified file 'README'
--- README	2013-07-19 22:34:25 +0000
+++ README	2013-09-23 16:18:12 +0000
@@ -47,16 +47,16 @@
 
 Separating the volume service from the API service allows the storage pool
 to easily scale without the added complexity that accompanies load-balancing
-the API server.  When we've exhausted local storage on volume serve, we can
+the API server.  When we've exhausted local storage on volume server, we can
 simply add-unit to expand our capacity.  Future requests to allocate volumes
-will be distributed across the pool for volume servers according to the
+will be distributed across the pool of volume servers according to the
 availability of storage space.
 
     $ cat >cinder.cfg <<END
     cinder-api:
         enabled-services: api, scheduler
     cinder-volume:
-        enabled-serfvices: volume
+        enabled-services: volume
         block-device: sdc
         overwrite: true
     END

=== modified file 'config.yaml'
--- config.yaml	2013-06-13 00:55:02 +0000
+++ config.yaml	2013-09-23 16:18:12 +0000
@@ -62,6 +62,14 @@
         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.
     # HA configuration settings
     vip:
         type: string

=== modified file 'hooks/cinder_contexts.py'
--- hooks/cinder_contexts.py	2013-07-16 21:57:41 +0000
+++ hooks/cinder_contexts.py	2013-09-23 16:18:12 +0000
@@ -15,6 +15,15 @@
 )
 
 
+class ImageServiceContext(OSContextGenerator):
+    interfaces = ['image-service']
+
+    def __call__(self):
+        if not relation_ids('image-service'):
+            return {}
+        return { 'glance_api_version': config('glance-api-version') }
+
+
 class CephContext(OSContextGenerator):
     interfaces = ['ceph']
 

=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2013-09-23 16:16:58 +0000
+++ hooks/cinder_utils.py	2013-09-23 16:18:12 +0000
@@ -103,7 +103,8 @@
                           context.AMQPContext(),
                           context.ImageServiceContext(),
                           cinder_contexts.CephContext(),
-                          cinder_contexts.HAProxyContext()],
+                          cinder_contexts.HAProxyContext(),
+                          cinder_contexts.ImageServiceContext()],
         'services': ['cinder-api', 'cinder-volume',
                      'cinder-scheduler', 'haproxy']
     }),

=== modified file 'templates/cinder.conf'
--- templates/cinder.conf	2013-07-19 22:34:03 +0000
+++ templates/cinder.conf	2013-09-23 16:18:12 +0000
@@ -36,3 +36,6 @@
 {% if glance_api_servers -%}
 glance_api_servers = {{ glance_api_servers }}
 {% endif -%}
+{% if glance_api_version -%}
+glance_api_version = {{ glance_api_version }}
+{% endif -%}
\ No newline at end of file