Merge lp:~louis/charms/precise/cinder/cinder-add-user-flags into lp:charms/raring/cinder

[Louis Bouchard]

Implements config-flags in the cinder charm as done in the nova-compute charm

=== modified file 'config.yaml'
--- config.yaml	2013-10-22 23:11:16 +0000
+++ config.yaml	2014-01-09 18:10:42 +0000
@@ -115,3 +115,6 @@
     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.

=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2013-10-17 21:48:08 +0000
+++ hooks/cinder_utils.py	2014-01-09 18:10:42 +0000
@@ -100,6 +100,7 @@
         'hook_contexts': [context.SharedDBContext(),
                           context.AMQPContext(),
                           context.ImageServiceContext(),
+                          context.OSConfigFlagContext(),
                           cinder_contexts.CephContext(),
                           cinder_contexts.HAProxyContext(),
                           cinder_contexts.ImageServiceContext()],

=== modified file 'revision'
--- revision	2013-10-17 21:48:08 +0000
+++ revision	2014-01-09 18:10:42 +0000
@@ -1,1 +1,1 @@
-129
+133

=== modified file 'templates/cinder.conf'
--- templates/cinder.conf	2013-10-22 23:11:16 +0000
+++ templates/cinder.conf	2014-01-09 18:10:42 +0000
@@ -41,4 +41,11 @@
 {% endif -%}
 {% if glance_api_version -%}
 glance_api_version = {{ glance_api_version }}
-{% endif -%}
\ No newline at end of file
+{% endif -%}
+
+{% if user_config_flags -%}
+{% for key, value in user_config_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
+