Browse Source

Use transport_url for Ocata or later

Add a new template for Ocata based on the Mitaka template.

Switch Ocata and Queens templates to use parts from openstack layer
for [DEFAULT]transport_url and remaining [oslo_messaging_rabbit]
HA and SSL configuration options.

Change-Id: If4effe782d61fd0d2f29a6e56cce623af7b324a3
Closes-Bug: 1817672
changes/93/639293/1
James Page 3 months ago
parent
commit
fac841f370
2 changed files with 84 additions and 3 deletions
  1. 81
    0
      src/templates/ocata/manila.conf
  2. 3
    3
      src/templates/queens/manila.conf

+ 81
- 0
src/templates/ocata/manila.conf View File

@@ -0,0 +1,81 @@
1
+# Note that the original manila.conf file is extensive and has many options
2
+# that the charm does not set.  Please refer to that file if there are options
3
+# that you think the charm should set, but doesn't, or provide options for.
4
+# Please file a bug at: https://bugs.launchpad.net/charm-barbican/+filebug for
5
+# any changes you need made or intend to modify in the charm.
6
+
7
+[DEFAULT]
8
+
9
+# This all needs to be configurable
10
+enabled_share_backends = {{ options.computed_share_backends }}
11
+
12
+# enabled_share_protocols = NFS,CIFS
13
+enabled_share_protocols = {{ options.computed_share_protocols }}
14
+
15
+#default_share_type = default_share_type
16
+default_share_type = {{ options.default_share_type }}
17
+
18
+state_path = /var/local/manila
19
+osapi_share_extension = manila.api.contrib.standard_extenstions
20
+rootwrap_config = /etc/manila/rootwrap.conf
21
+api_paste_config = /etc/manila/api-paste.ini
22
+share_name_template = share-%s
23
+
24
+scheduler_driver = manila.scheduler.drivers.filter.FilterScheduler
25
+
26
+debug = {{ options.debug }}
27
+
28
+# Number of workers for OpenStack Share API service. (integer value)
29
+osapi_share_workers = {{ options.workers }}
30
+
31
+{% include "parts/section-transport-url" %}
32
+
33
+[cors]
34
+
35
+#
36
+# From oslo.middleware.cors
37
+#
38
+
39
+[cors.subdomain]
40
+
41
+#
42
+# From oslo.middleware.cors
43
+#
44
+
45
+# parts/section-database includes the [database] section identifier
46
+{% include "parts/section-database" %}
47
+
48
+
49
+# parts/section-keystone-authtoken includes the [keystone_authtoken] section
50
+# identifier
51
+{% include "parts/section-keystone-authtoken" %}
52
+
53
+
54
+
55
+[matchmaker_redis]
56
+
57
+#
58
+# From oslo.messaging
59
+#
60
+
61
+[oslo_messaging_amqp]
62
+
63
+#
64
+# From oslo.messaging
65
+#
66
+
67
+[oslo_messaging_notifications]
68
+
69
+#
70
+# From oslo.messaging
71
+#
72
+
73
+{% include "parts/section-oslo-messaging-rabbit" %}
74
+
75
+#
76
+# Now configuration from the backend manila-plugin charms
77
+#
78
+
79
+{% for line in options.computed_backend_lines_manila_conf %}
80
+{{ line }}
81
+{%- endfor %}

+ 3
- 3
src/templates/queens/manila.conf View File

@@ -28,9 +28,7 @@ debug = {{ options.debug }}
28 28
 # Number of workers for OpenStack Share API service. (integer value)
29 29
 osapi_share_workers = {{ options.workers }}
30 30
 
31
-{% if amqp.transport_url -%}
32
-transport_url = {{ amqp.transport_url }}
33
-{% endif -%}
31
+{% include "parts/section-transport-url" %}
34 32
 
35 33
 [cors]
36 34
 
@@ -72,6 +70,8 @@ transport_url = {{ amqp.transport_url }}
72 70
 # From oslo.messaging
73 71
 #
74 72
 
73
+{% include "parts/section-oslo-messaging-rabbit" %}
74
+
75 75
 #
76 76
 # Now configuration from the backend manila-plugin charms
77 77
 #

Loading…
Cancel
Save