openstack
/
kayobe
Code Issues Proposed changes

Merge "Add support for a custom octavia.conf file"

This commit is contained in:
Zuul 2018-11-27 17:04:42 +00:00 committed by Gerrit Code Review
parent 73fb8c39c8 3d1018dea9
commit a3c1034ffd
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

@ -116,6 +116,7 @@
- { name: neutron, file: neutron.conf }
- { name: neutron_ml2, file: neutron/ml2_conf.ini }
- { name: nova, file: nova.conf }
- { name: octavia, file: octavia.conf }
- { name: sahara, file: sahara.conf }
- { name: zookeeper, file: zookeeper.cfg }
@ -219,6 +220,7 @@
kolla_extra_neutron: "{{ kolla_extra_config.neutron | default }}"
kolla_extra_neutron_ml2: "{{ kolla_extra_config.neutron_ml2 | 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_zookeeper: "{{ kolla_extra_config.zookeeper | default }}"
kolla_extra_config_path: "{{ kayobe_config_path }}/kolla/config"

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

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

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

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

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

@ -29,6 +29,7 @@
- { src: murano.conf.j2, dest: murano.conf, enabled: "{{ kolla_enable_murano }}" }
- { src: neutron.conf.j2, dest: neutron.conf, enabled: "{{ kolla_enable_neutron }}" }
- { 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: inspector.ipxe.j2, dest: ironic/inspector.ipxe, enabled: "{{ kolla_enable_ironic_ipxe }}" }
- { 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 %}