Add missing barbican.conf support
Story: 2008170 Task: 40925 Change-Id: I3014983f481a5dca7c93e140b3e10caa5d537669
This commit is contained in:
parent
c585554988
commit
0f25900a43
@ -105,6 +105,7 @@
|
||||
register: stat_result
|
||||
with_items:
|
||||
- { name: aodh, file: aodh.conf }
|
||||
- { name: barbican, file: barbican.conf }
|
||||
- { name: blazar, file: blazar.conf }
|
||||
- { name: ceilometer, file: ceilometer.conf }
|
||||
- { name: cinder, file: cinder.conf }
|
||||
@ -214,6 +215,7 @@
|
||||
endpoint_override: "http://{% raw %}{{ api_interface_address }}{% endraw %}:{{ inspector_store_port }}"
|
||||
# Extra free-form user-provided configuration.
|
||||
kolla_extra_aodh: "{{ kolla_extra_config.aodh | default }}"
|
||||
kolla_extra_barbican: "{{ kolla_extra_config.barbican | default }}"
|
||||
kolla_extra_blazar: "{{ kolla_extra_config.blazar | default }}"
|
||||
kolla_extra_ceilometer: "{{ kolla_extra_config.ceilometer | default }}"
|
||||
kolla_extra_cinder: "{{ kolla_extra_config.cinder | default }}"
|
||||
|
@ -26,6 +26,9 @@ kolla_extra_aodh:
|
||||
# Whether to enable Barbican.
|
||||
kolla_enable_barbican:
|
||||
|
||||
# Free form extra configuration to append to barbican.conf.
|
||||
kolla_extra_barbican:
|
||||
|
||||
###############################################################################
|
||||
# Blazar configuration.
|
||||
|
||||
|
@ -18,6 +18,10 @@ provisioner:
|
||||
kolla_extra_aodh: |
|
||||
[extra-aodh.conf]
|
||||
foo=bar
|
||||
kolla_enable_barbican: true
|
||||
kolla_extra_barbican: |
|
||||
[extra-barbican.conf]
|
||||
foo=bar
|
||||
kolla_enable_blazar: true
|
||||
kolla_extra_blazar: |
|
||||
[extra-blazar.conf]
|
||||
|
@ -28,6 +28,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
|
||||
@pytest.mark.parametrize(
|
||||
'path',
|
||||
['aodh',
|
||||
'barbican',
|
||||
'cinder',
|
||||
'cloudkitty',
|
||||
'designate',
|
||||
@ -63,6 +64,7 @@ def test_service_config_directory(host, path):
|
||||
@pytest.mark.parametrize(
|
||||
'path',
|
||||
['aodh.conf',
|
||||
'barbican.conf',
|
||||
'cinder.conf',
|
||||
'cloudkitty.conf',
|
||||
'designate.conf',
|
||||
|
@ -14,6 +14,7 @@
|
||||
mode: 0640
|
||||
with_items:
|
||||
- { src: aodh.conf.j2, dest: aodh.conf, enabled: "{{ kolla_enable_aodh }}" }
|
||||
- { src: barbican.conf.j2, dest: barbican.conf, enabled: "{{ kolla_enable_barbican }}" }
|
||||
- { src: blazar.conf.j2, dest: blazar.conf, enabled: "{{ kolla_enable_blazar }}" }
|
||||
- { src: ceilometer.conf.j2, dest: ceilometer.conf, enabled: "{{ kolla_enable_ceilometer }}" }
|
||||
- { src: cinder.conf.j2, dest: cinder.conf, enabled: "{{ kolla_enable_cinder }}" }
|
||||
|
9
ansible/roles/kolla-openstack/templates/barbican.conf.j2
Normal file
9
ansible/roles/kolla-openstack/templates/barbican.conf.j2
Normal file
@ -0,0 +1,9 @@
|
||||
# {{ ansible_managed }}
|
||||
|
||||
{% if kolla_extra_barbican %}
|
||||
#######################
|
||||
# Extra configuration
|
||||
#######################
|
||||
|
||||
{{ kolla_extra_barbican }}
|
||||
{% endif %}
|
@ -505,6 +505,7 @@ which files are supported.
|
||||
``aodh.conf`` Aodh configuration.
|
||||
``aodh/*`` Extended Aodh configuration.
|
||||
``backup.my.cnf`` Mariabackup configuration.
|
||||
``barbican.conf`` Barbican configuration.
|
||||
``barbican/*`` Extended Barbican configuration.
|
||||
``blazar.conf`` Blazar configuration.
|
||||
``blazar/*`` Extended Blazar configuration.
|
||||
|
@ -0,0 +1,6 @@
|
||||
---
|
||||
fixes:
|
||||
- |
|
||||
Adds support for a custom Barbican configuration file (``barbican.conf``),
|
||||
as only extended configuration stored under a ``barbican`` folder was
|
||||
supported.
|
Loading…
Reference in New Issue
Block a user