openstack/kayobe
Code Issues Proposed changes

Add support for a custom octavia.conf file

Browse Source 
Kayobe should be able to handle extra configuration options in Octavia's
main configuration file, in a similar fashion to other services.  This
commit adds support for just that.

TrivialFix

Change-Id: Ibd91a90a5278bcd8963fb06874a74f71b1882d89
This commit is contained in:
Nick Jones 2018-11-22 18:51:39 +00:00
parent 016d23aa83
commit 3d1018dea9
No known key found for this signature in database
GPG Key ID: F6D24C8669938334
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

@ -115,6 +115,7 @@
- { name: neutron, file: neutron.conf } - { name: neutron, file: neutron.conf }
- { name: neutron_ml2, file: neutron/ml2_conf.ini } - { name: neutron_ml2, file: neutron/ml2_conf.ini }
- { name: nova, file: nova.conf } - { name: nova, file: nova.conf }
- { name: octavia, file: octavia.conf }
- { name: sahara, file: sahara.conf } - { name: sahara, file: sahara.conf }
- { name: zookeeper, file: zookeeper.cfg } - { name: zookeeper, file: zookeeper.cfg }
@ -217,6 +218,7 @@
kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}" kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}"
kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}" kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | default }}"
kolla_extra_nova: "{{ kolla_extra_config.nova | default }}" kolla_extra_nova: "{{ kolla_extra_config.nova | default }}"
kolla_extra_octavia: "{{ kolla_extra_config.octavia | default }}"
kolla_extra_sahara: "{{ kolla_extra_config.sahara | default }}" kolla_extra_sahara: "{{ kolla_extra_config.sahara | default }}"
kolla_extra_zookeeper: "{{ kolla_extra_config.zookeeper | default }}" kolla_extra_zookeeper: "{{ kolla_extra_config.zookeeper | default }}"
kolla_extra_config_path: "{{ kayobe_config_path }}/kolla/config" kolla_extra_config_path: "{{ kayobe_config_path }}/kolla/config"

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

@ -79,6 +79,9 @@ provisioner:
[extra-nova.conf] [extra-nova.conf]
foo=bar foo=bar
kolla_enable_octavia: true kolla_enable_octavia: true
kolla_extra_octavia: |
[extra-octavia.conf]
foo=bar
kolla_enable_sahara: true kolla_enable_sahara: true
kolla_extra_sahara: | kolla_extra_sahara: |
[extra-sahara.conf] [extra-sahara.conf]

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

@ -74,6 +74,7 @@ def test_service_config_directory(host, path):
'murano.conf', 'murano.conf',
'neutron.conf', 'neutron.conf',
'nova.conf', 'nova.conf',
'octavia.conf',
'sahara.conf', 'sahara.conf',
'zookeeper.cfg']) 'zookeeper.cfg'])
def test_service_ini_file(host, path): def test_service_ini_file(host, path):

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

@ -28,6 +28,7 @@
- { 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 }}" }
- { src: nova.conf.j2, dest: nova.conf, enabled: "{{ kolla_enable_nova }}" } - { src: nova.conf.j2, dest: nova.conf, enabled: "{{ kolla_enable_nova }}" }
- { src: octavia.conf.j2, dest: octavia.conf, enabled: "{{ kolla_enable_octavia }}" }
- { src: pxelinux.default.j2, dest: ironic/pxelinux.default, enabled: "{{ kolla_enable_ironic }}" } - { src: pxelinux.default.j2, dest: ironic/pxelinux.default, enabled: "{{ kolla_enable_ironic }}" }
- { src: inspector.ipxe.j2, dest: ironic/inspector.ipxe, enabled: "{{ kolla_enable_ironic_ipxe }}" } - { src: inspector.ipxe.j2, dest: ironic/inspector.ipxe, enabled: "{{ kolla_enable_ironic_ipxe }}" }
- { src: sahara.conf.j2, dest: sahara.conf, enabled: "{{ kolla_enable_sahara }}" } - { src: sahara.conf.j2, dest: sahara.conf, enabled: "{{ kolla_enable_sahara }}" }

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

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