Merge lp:~james-page/charms/trusty/glance/lp1456379-stable into lp:~openstack-charmers-archive/charms/trusty/glance/trunk

Proposed by James Page
Status: Merged
Merged at revision: 118
Proposed branch: lp:~james-page/charms/trusty/glance/lp1456379-stable
Merge into: lp:~openstack-charmers-archive/charms/trusty/glance/trunk
Diff against target: 59 lines (+17/-19)
1 file modified
templates/kilo/glance-api.conf (+17/-19)
To merge this branch: bzr merge lp:~james-page/charms/trusty/glance/lp1456379-stable
Reviewer Review Type Date Requested Status
Liam Young Approve
Review via email: mp+260912@code.launchpad.net

Description of the change

Fixup kilo glance-api template

To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'templates/kilo/glance-api.conf'
2--- templates/kilo/glance-api.conf 2015-03-25 09:25:38 +0000
3+++ templates/kilo/glance-api.conf 2015-06-03 07:51:52 +0000
4@@ -3,16 +3,6 @@
5 use_syslog = {{ use_syslog }}
6 debug = {{ debug }}
7 workers = {{ workers }}
8-
9-known_stores = {{ known_stores }}
10-{% if rbd_pool -%}
11-default_store = rbd
12-{% elif swift_store -%}
13-default_store = swift
14-{% else -%}
15-default_store = file
16-{% endif -%}
17-
18 bind_host = {{ bind_host }}
19
20 {% if ext -%}
21@@ -40,6 +30,23 @@
22 notification_driver = rabbit
23 {% endif -%}
24
25+delayed_delete = False
26+scrub_time = 43200
27+scrubber_datadir = /var/lib/glance/scrubber
28+image_cache_dir = /var/lib/glance/image-cache/
29+db_enforce_mysql_charset = False
30+
31+[glance_store]
32+filesystem_store_datadir = /var/lib/glance/images/
33+stores = {{ known_stores }}
34+{% if rbd_pool -%}
35+default_store = rbd
36+{% elif swift_store -%}
37+default_store = swift
38+{% else -%}
39+default_store = file
40+{% endif -%}
41+
42 {% if swift_store -%}
43 swift_store_auth_version = 2
44 swift_store_auth_address = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0/
45@@ -59,15 +66,6 @@
46 rbd_store_chunk_size = 8
47 {% endif -%}
48
49-delayed_delete = False
50-scrub_time = 43200
51-scrubber_datadir = /var/lib/glance/scrubber
52-image_cache_dir = /var/lib/glance/image-cache/
53-db_enforce_mysql_charset = False
54-
55-[glance_store]
56-filesystem_store_datadir = /var/lib/glance/images/
57-
58 [image_format]
59 disk_formats=ami,ari,aki,vhd,vmdk,raw,qcow2,vdi,iso,root-tar
60

Subscribers

People subscribed via source and target branches