openstack/charm-cinder
Code Issues Proposed changes

[Louis Bouchard] Implement config-flags functionality as implemented in nova-compute charm

Browse Source
This commit is contained in:
James Page 2014-01-10 10:38:03 +00:00
commit 98fdb0a682
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config.yaml
View File

@ -115,3 +115,6 @@ options:
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.

1
hooks/cinder_utils.py
View File

@ -100,6 +100,7 @@ CONFIG_FILES = OrderedDict([
'hook_contexts': [context.SharedDBContext(),
context.AMQPContext(),
context.ImageServiceContext(),
context.OSConfigFlagContext(),
cinder_contexts.CephContext(),
cinder_contexts.HAProxyContext(),
cinder_contexts.ImageServiceContext()],

2
revision
View File

@ -1 +1 @@
129
133

9
templates/cinder.conf
View File

@ -41,4 +41,11 @@ glance_api_servers = {{ glance_api_servers }}
{% endif -%}
{% if glance_api_version -%}
glance_api_version = {{ glance_api_version }}
{% endif -%}
{% endif -%}
{% if user_config_flags -%}
{% for key, value in user_config_flags.iteritems() -%}
{{ key }} = {{ value }}
{% endfor -%}
{% endif -%}