Merge lp:~hopem/charms/precise/cinder/trunk into lp:charms/raring/cinder

[Edward Hope-Morley]

If Cinder and Glance are using Ceph as a backend store,
the Cinder RBD driver requires Glance API v2 to perform
certain newer actions (as of Grizzly) e.g. copy-on-write
cloning of images. This fix applies, fro Grizzly and up,
glance_api_version to /etc/cinder/cinder.conf with a
default value of 1 for backwards comaptibility.

Note that Glance must have the following config set for
Cinder/Ceph copy-on-write to work:

show_image_direct_url = True

FIXES: LP1187123

[Adam Gandelman (gandelman-a)]

Hey Edward, Thanks for the merge. Couple of things:

- Shouldn't to add the os_version_is_gte() to openstack-common, we can take advantage of dpkg's version checking to accomplish the same thing, eg:

if dpkg --compare-versions "$(get_os_version_package cinder-volume)" ge 2013.1 ; then
  # do some grizzly stuff
fi

Also, you should check for cinder-common's version and not cinder-volume. ATM cinder-common is installed for all cinder services. cinder-volume will only be installed if enabled-services includes volume.

- Not sure the best way to set the glance API is through config. Its potentially error prone eg, settings API v2 but current related glance server only supports v1. Some other options:

  * The API setting goes into config glance charms config and api_version='$(config-get api-version)' is sent to related services via the image-service interface. glance charm can take responsibility of ensuring its configured to support that API version.

  * During image-service-relation-changed the cinder charm can inspect the glance endpoint in keystone to set it in cinder.conf accordingly. This may be a simple curl request to the endpoint to list supported API versions (if the api server supports such a request)

review: Needs Fixing

[Edward Hope-Morley (hopem)]

I have fixed most points. I agree that ulitmately we should use glance relation to check what api version(s) are supported but this should not break anything as is. This value will not be set < G and even it id did it would be ignored. I have made the default v1 (which would be default even if the setting were not defined in cinder.conf). it is then up to the user to define the appropriate api version to use.

[Adam Gandelman (gandelman-a)]

Hey Edward-

Both the cinder and glance charms are in the middle of a python rewrite and I'd prefer to include the proper solution as part of that work. Since we both agree the solution should exist in the image-service relation interface, I'd prefer not to add temporary config options to config.yaml as a stop-gap.

One alternative solution for the short-term that comes to mind is implementing a 'config-flags' field in cinder similar to the nova-* that let you define arbitrary key=value settings that get set in config. This would let you set the flag (and any others) until the interface supports handling it for you.

review: Disapprove

Unmerged revisions

23. By Edward Hope-Morley on 2013-06-14

If Cinder and Glance are using Ceph as a backend store,
the Cinder RBD driver requires Glance API v2 to perform
certain newer actions (as of Grizzly) e.g. copy-on-write
cloning of images. This fix applies, fro Grizzly and up,
glance_api_version to /etc/cinder/cinder.conf with a
default value of 1 for backwards comaptibility.

Note that Glance must have the following config set for
Cinder/Ceph copy-on-write to work:

show_image_direct_url = True

FIXES: LP1187123

22. By Edward Hope-Morley on 2013-06-12

If Cinder and Glance are using Ceph as a backend store,
the Cinder RBD driver requires Glance API v2 to perform
certain newer actions (as of Grizzly) e.g. copy-on-write
cloning of images. This fix applies glance_api_version to
/etc/cinder/cinder.conf with a default value of 2.

Note that Glance must have the following config set for
Cinder/Ceph copy-on-write to work:

show_image_direct_url = True

FIXES: LP1187123

=== modified file 'README'
--- README	2012-11-29 00:03:42 +0000
+++ README	2013-06-14 12:40:47 +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-02-20 01:42:47 +0000
+++ config.yaml	2013-06-14 12:40:47 +0000
@@ -86,6 +86,15 @@
         description: |
           Default multicast port number that will be used to communicate between
           HA Cluster nodes.
+    glance-api-version:
+        type: int
+        default: 1
+        description: |
+          Some drivers in Grizzly require the v2 Glance API to perform certain
+          actions e.g. Ceph RBD driver requires v2 API to perform copy-on-write
+          cloning of images. This option will only be set for Grizzly and up
+          and will default to v1 for backwards compatibility with related
+          glance services.
     # Per-service HTTPS configuration.
     ssl_cert:
         type: string

=== modified file 'hooks/cinder-hooks'
--- hooks/cinder-hooks	2013-05-22 00:53:45 +0000
+++ hooks/cinder-hooks	2013-06-14 12:40:47 +0000
@@ -295,6 +295,19 @@
     do_openstack_upgrade "$install_src" $(determine_packages) python-keystoneclient
   fi
 
+  # default to api v1 for backwards compatibility
+  local glance_api_version=
+  glance_api_version=`config-get glance-api-version`
+  [ -n "glance_api_version" ] || $glance_api_version=1
+
+  # refresh after possible upgrade
+  cur=$(get_os_codename_package "cinder-common")
+
+  # only set for Grizzly and up
+  dpkg --compare-versions $(get_os_version_codename "$cur") ge \
+                          $(get_os_version_codename "grizzly") && \
+      set_or_update glance_api_version $glance_api_version
+
   configure_https
   # Save our scriptrc env variables for health checks
   declare -a env_vars=(

=== modified file 'revision'
--- revision	2013-05-22 00:19:16 +0000
+++ revision	2013-06-14 12:40:47 +0000
@@ -1,1 +1,1 @@
-27
+28