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
This commit is contained in:
parent
5fc15ee7a4
commit
fac841f370
|
@ -0,0 +1,81 @@
|
|||
# Note that the original manila.conf file is extensive and has many options
|
||||
# that the charm does not set. Please refer to that file if there are options
|
||||
# that you think the charm should set, but doesn't, or provide options for.
|
||||
# Please file a bug at: https://bugs.launchpad.net/charm-barbican/+filebug for
|
||||
# any changes you need made or intend to modify in the charm.
|
||||
|
||||
[DEFAULT]
|
||||
|
||||
# This all needs to be configurable
|
||||
enabled_share_backends = {{ options.computed_share_backends }}
|
||||
|
||||
# enabled_share_protocols = NFS,CIFS
|
||||
enabled_share_protocols = {{ options.computed_share_protocols }}
|
||||
|
||||
#default_share_type = default_share_type
|
||||
default_share_type = {{ options.default_share_type }}
|
||||
|
||||
state_path = /var/local/manila
|
||||
osapi_share_extension = manila.api.contrib.standard_extenstions
|
||||
rootwrap_config = /etc/manila/rootwrap.conf
|
||||
api_paste_config = /etc/manila/api-paste.ini
|
||||
share_name_template = share-%s
|
||||
|
||||
scheduler_driver = manila.scheduler.drivers.filter.FilterScheduler
|
||||
|
||||
debug = {{ options.debug }}
|
||||
|
||||
# Number of workers for OpenStack Share API service. (integer value)
|
||||
osapi_share_workers = {{ options.workers }}
|
||||
|
||||
{% include "parts/section-transport-url" %}
|
||||
|
||||
[cors]
|
||||
|
||||
#
|
||||
# From oslo.middleware.cors
|
||||
#
|
||||
|
||||
[cors.subdomain]
|
||||
|
||||
#
|
||||
# From oslo.middleware.cors
|
||||
#
|
||||
|
||||
# parts/section-database includes the [database] section identifier
|
||||
{% include "parts/section-database" %}
|
||||
|
||||
|
||||
# parts/section-keystone-authtoken includes the [keystone_authtoken] section
|
||||
# identifier
|
||||
{% include "parts/section-keystone-authtoken" %}
|
||||
|
||||
|
||||
|
||||
[matchmaker_redis]
|
||||
|
||||
#
|
||||
# From oslo.messaging
|
||||
#
|
||||
|
||||
[oslo_messaging_amqp]
|
||||
|
||||
#
|
||||
# From oslo.messaging
|
||||
#
|
||||
|
||||
[oslo_messaging_notifications]
|
||||
|
||||
#
|
||||
# From oslo.messaging
|
||||
#
|
||||
|
||||
{% include "parts/section-oslo-messaging-rabbit" %}
|
||||
|
||||
#
|
||||
# Now configuration from the backend manila-plugin charms
|
||||
#
|
||||
|
||||
{% for line in options.computed_backend_lines_manila_conf %}
|
||||
{{ line }}
|
||||
{%- endfor %}
|
|
@ -28,9 +28,7 @@ debug = {{ options.debug }}
|
|||
# Number of workers for OpenStack Share API service. (integer value)
|
||||
osapi_share_workers = {{ options.workers }}
|
||||
|
||||
{% if amqp.transport_url -%}
|
||||
transport_url = {{ amqp.transport_url }}
|
||||
{% endif -%}
|
||||
{% include "parts/section-transport-url" %}
|
||||
|
||||
[cors]
|
||||
|
||||
|
@ -72,6 +70,8 @@ transport_url = {{ amqp.transport_url }}
|
|||
# From oslo.messaging
|
||||
#
|
||||
|
||||
{% include "parts/section-oslo-messaging-rabbit" %}
|
||||
|
||||
#
|
||||
# Now configuration from the backend manila-plugin charms
|
||||
#
|
||||
|
|
Loading…
Reference in New Issue