merge trunk

hooks/cinder_utils.py

@@ -4,8 +4,6 @@ import subprocess
 from collections import OrderedDict
 from copy import copy
 
-import cinder_contexts
-
 from charmhelpers.core.hookenv import (
     config,
     relation_ids,
@@ -59,6 +57,7 @@ from charmhelpers.contrib.openstack.utils import (
     get_os_codename_install_source,
 )
 
+import cinder_contexts
 
 COMMON_PACKAGES = [
     'apache2',
@@ -102,6 +101,7 @@ CONFIG_FILES = OrderedDict([
                           context.AMQPContext(ssl_dir=CINDER_CONF_DIR),
                           context.ImageServiceContext(),
                           context.OSConfigFlagContext(),
+                          context.SyslogContext(),
                           cinder_contexts.CephContext(),
                           cinder_contexts.HAProxyContext(),
                           cinder_contexts.ImageServiceContext()],