Merge multi-backend support

2014-04-02 08:58:11 +01:00
parent bfbf3eaa09 2b386f230d
commit 8fd9822928
14 changed files with 91 additions and 2 deletions
--- a/hooks/cinder_utils.py
+++ b/hooks/cinder_utils.py
@@ -119,7 +119,12 @@ CONFIG_FILES = OrderedDict([
                          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()],
        'services': ['cinder-api', 'cinder-volume',
                     'cinder-scheduler', 'haproxy']
    }),