openstack/kayobe
Code Issues Proposed changes

Enable manila extra config merge #28058

Browse Source 
This commit enables the merge of additional manila.conf
as seen with the other projects.

Change-Id: Ia2209a9c82215e49f1ef5a79ecafbebf2b204627
Closes-Bug: 28058
This commit is contained in:
Ross Martyn 2018-11-22 19:35:08 +00:00
parent 016d23aa83
commit 46e40301f8
5 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/kolla-openstack.yml
View File

@ -110,6 +110,7 @@
- { name: ironic, file: ironic.conf } - { name: ironic, file: ironic.conf }
- { name: kafka, file: kafka.server.properties } - { name: kafka, file: kafka.server.properties }
- { name: magnum, file: magnum.conf } - { name: magnum, file: magnum.conf }
- { name: manila, file: manila.conf }
- { name: mariadb, file: galera.cnf } - { name: mariadb, file: galera.cnf }
- { name: murano, file: murano.conf } - { name: murano, file: murano.conf }
- { name: neutron, file: neutron.conf } - { name: neutron, file: neutron.conf }
@ -212,6 +213,7 @@
kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}" kolla_extra_ironic: "{{ kolla_extra_config.ironic | default }}"
kolla_extra_kafka: "{{ kolla_extra_config.kafka | default }}" kolla_extra_kafka: "{{ kolla_extra_config.kafka | default }}"
kolla_extra_magnum: "{{ kolla_extra_config.magnum | default }}" kolla_extra_magnum: "{{ kolla_extra_config.magnum | default }}"
kolla_extra_manila: "{{ kolla_extra_config.manila | default }}"
kolla_extra_mariadb: "{{ kolla_extra_config.mariadb | default }}" kolla_extra_mariadb: "{{ kolla_extra_config.mariadb | default }}"
kolla_extra_murano: "{{ kolla_extra_config.murano | default }}" kolla_extra_murano: "{{ kolla_extra_config.murano | default }}"
kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}" kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}"

3
ansible/roles/kolla-openstack/molecule/enable-everything/molecule.yml
View File

@ -58,6 +58,9 @@ provisioner:
[extra-magnum.conf] [extra-magnum.conf]
foo=bar foo=bar
kolla_enable_manila: true kolla_enable_manila: true
kolla_extra_manila: |
[extra-manila.conf]
foo=bar
kolla_enable_mariadb: true kolla_enable_mariadb: true
kolla_extra_mariadb: | kolla_extra_mariadb: |
[extra-galera.cnf] [extra-galera.cnf]

1
ansible/roles/kolla-openstack/molecule/enable-everything/tests/test_default.py
View File

@ -70,6 +70,7 @@ def test_service_config_directory(host, path):
'ironic-inspector.conf', 'ironic-inspector.conf',
'kafka.server.properties', 'kafka.server.properties',
'magnum.conf', 'magnum.conf',
'manila.conf',
'neutron/ml2_conf.ini', 'neutron/ml2_conf.ini',
'murano.conf', 'murano.conf',
'neutron.conf', 'neutron.conf',

1
ansible/roles/kolla-openstack/tasks/config.yml
View File

@ -24,6 +24,7 @@
- { src: ironic-inspector.conf.j2, dest: ironic-inspector.conf, enabled: "{{ kolla_enable_ironic }}" } - { src: ironic-inspector.conf.j2, dest: ironic-inspector.conf, enabled: "{{ kolla_enable_ironic }}" }
- { src: kafka.server.properties.j2, dest: kafka.server.properties, enabled: "{{ kolla_enable_kafka }}" } - { src: kafka.server.properties.j2, dest: kafka.server.properties, enabled: "{{ kolla_enable_kafka }}" }
- { src: magnum.conf.j2, dest: magnum.conf, enabled: "{{ kolla_enable_magnum }}" } - { src: magnum.conf.j2, dest: magnum.conf, enabled: "{{ kolla_enable_magnum }}" }
- { src: manila.conf.j2, dest: manila.conf, enabled: "{{ kolla_enable_manila }}" }
- { src: ml2_conf.ini.j2, dest: neutron/ml2_conf.ini, enabled: "{{ kolla_enable_neutron }}" } - { src: ml2_conf.ini.j2, dest: neutron/ml2_conf.ini, enabled: "{{ kolla_enable_neutron }}" }
- { src: murano.conf.j2, dest: murano.conf, enabled: "{{ kolla_enable_murano }}" } - { src: murano.conf.j2, dest: murano.conf, enabled: "{{ kolla_enable_murano }}" }
- { src: neutron.conf.j2, dest: neutron.conf, enabled: "{{ kolla_enable_neutron }}" } - { src: neutron.conf.j2, dest: neutron.conf, enabled: "{{ kolla_enable_neutron }}" }

9
ansible/roles/kolla-openstack/templates/manila.conf.j2 Normal file
View File

@ -0,0 +1,9 @@
# {{ ansible_managed }}
{% if kolla_extra_manila %}
#######################
# Extra configuration
#######################
{{ kolla_extra_manila }}
{% endif %}