Tidy icehouse templates, add logging config options

config.yaml

@@ -91,6 +91,14 @@ options:
     description: |
       By default, all services will log into their corresponding log files.
       Setting this to True will force all services to log to the syslog.
+  debug:
+    default: False
+    type: boolean
+    description: Enable debug logging
+  verbose:
+    default: False
+    type: boolean
+    description: Enable verbose logging
   # HA configuration settings
   vip:
     type: string

hooks/cinder_contexts.py

@@ -102,3 +102,8 @@ class StorageBackendContext(OSContextGenerator):
             return {'backends': ",".join(backends)}
         else:
             return {}
+
+
+class LoggingConfigContext(OSContextGenerator):
+    def __call__(self):
+        return {'debug': config('debug'), 'verbose': config('verbose')}

hooks/cinder_utils.py

@@ -125,7 +125,9 @@ CONFIG_FILES = OrderedDict([
                               interface='storage-backend',
                               service='cinder',
                               config_file=CINDER_CONF),
-                          cinder_contexts.StorageBackendContext()],
+                          cinder_contexts.StorageBackendContext(),
+                          cinder_contexts.LoggingConfigContext(),
+                          context.IdentityServiceContext()],
         'services': ['cinder-api', 'cinder-volume',
                      'cinder-scheduler', 'haproxy']
     }),

templates/cinder.conf

@@ -9,7 +9,8 @@ api_paste_confg = /etc/cinder/api-paste.ini
 iscsi_helper = tgtadm
 volume_name_template = volume-%s
 volume_group = cinder-volumes
-verbose = True
+verbose = {{ verbose }}
+debug = {{ debug }}
 use_syslog = {{ use_syslog }}
 auth_strategy = keystone
 state_path = /var/lib/cinder

templates/grizzly/cinder.conf

@@ -9,7 +9,8 @@ api_paste_confg = /etc/cinder/api-paste.ini
 iscsi_helper = tgtadm
 volume_name_template = volume-%s
 volume_group = cinder-volumes
-verbose = True
+verbose = {{ verbose }}
+debug = {{ debug }}
 use_syslog = {{ use_syslog }}
 auth_strategy = keystone
 state_path = /var/lib/cinder

templates/icehouse/api-paste.ini

@@ -0,0 +1,55 @@
+#############
+# OpenStack #
+#############
+
+[composite:osapi_volume]
+use = call:cinder.api:root_app_factory
+/: apiversions
+/v1: openstack_volume_api_v1
+/v2: openstack_volume_api_v2
+
+[composite:openstack_volume_api_v1]
+use = call:cinder.api.middleware.auth:pipeline_factory
+noauth = request_id faultwrap sizelimit noauth apiv1
+keystone = request_id faultwrap sizelimit authtoken keystonecontext apiv1
+keystone_nolimit = request_id faultwrap sizelimit authtoken keystonecontext apiv1
+
+[composite:openstack_volume_api_v2]
+use = call:cinder.api.middleware.auth:pipeline_factory
+noauth = request_id faultwrap sizelimit noauth apiv2
+keystone = request_id faultwrap sizelimit authtoken keystonecontext apiv2
+keystone_nolimit = request_id faultwrap sizelimit authtoken keystonecontext apiv2
+
+[filter:request_id]
+paste.filter_factory = cinder.openstack.common.middleware.request_id:RequestIdMiddleware.factory
+
+[filter:faultwrap]
+paste.filter_factory = cinder.api.middleware.fault:FaultWrapper.factory
+
+[filter:noauth]
+paste.filter_factory = cinder.api.middleware.auth:NoAuthMiddleware.factory
+
+[filter:sizelimit]
+paste.filter_factory = cinder.api.middleware.sizelimit:RequestBodySizeLimiter.factory
+
+[app:apiv1]
+paste.app_factory = cinder.api.v1.router:APIRouter.factory
+
+[app:apiv2]
+paste.app_factory = cinder.api.v2.router:APIRouter.factory
+
+[pipeline:apiversions]
+pipeline = faultwrap osvolumeversionapp
+
+[app:osvolumeversionapp]
+paste.app_factory = cinder.api.versions:Versions.factory
+
+##########
+# Shared #
+##########
+
+[filter:keystonecontext]
+paste.filter_factory = cinder.api.middleware.auth:CinderKeystoneContext.factory
+
+[filter:authtoken]
+paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory

templates/icehouse/cinder.conf

@@ -9,7 +9,8 @@ api_paste_confg = /etc/cinder/api-paste.ini
 iscsi_helper = tgtadm
 volume_name_template = volume-%s
 volume_group = cinder-volumes
-verbose = True
+verbose = {{ verbose }}
+debug = {{ debug }}
 use_syslog = {{ use_syslog }}
 auth_strategy = keystone
 state_path = /var/lib/cinder
@@ -40,6 +41,7 @@ osapi_volume_listen_port = {{ osapi_volume_listen_port }}
 {% if glance_api_servers -%}
 glance_api_servers = {{ glance_api_servers }}
 {% endif -%}
+
 {% if glance_api_version -%}
 glance_api_version = {{ glance_api_version }}
 {% endif -%}
@@ -52,4 +54,15 @@ glance_api_version = {{ glance_api_version }}
 
 {% include "parts/backends" %}
 
+{% if auth_host -%}
+[keystone_authtoken]
+auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/
+auth_host = {{ auth_host }}
+auth_port = {{ auth_port }}
+auth_protocol = {{ auth_protocol }}
+admin_tenant_name = {{ admin_tenant_name }}
+admin_user = {{ admin_user }}
+admin_password = {{ admin_password }}
+{% endif -%}
+
 {% include "parts/section-database" %}