Add 'octavia' in to the list of paths to search for custom configs

As it says on the tin. It's useful to add support for copying custom
configuration for Octavia into place via Kayobe, specifically for files
that need to be encrypted such as private certificates.

TrivialFix

Change-Id: I026513bf3d7e4f871c83efd0740f75191ffaa969
This commit is contained in:
Nick Jones 2018-11-02 18:45:54 +00:00
parent 330d4b2c81
commit 43b6276f36
5 changed files with 16 additions and 0 deletions

View File

@ -182,6 +182,8 @@ overcloud_container_image_regex_map:
enabled: "{{ kolla_enable_neutron_lbaas | bool }}"
- regex: nova
enabled: "{{ kolla_enable_nova | bool }}"
- regex: octavia
enabled: "{{ kolla_enable_octavia | bool }}"
- regex: openvswitch
enabled: "{{ kolla_enable_neutron | bool }}"
- regex: rabbitmq
@ -360,6 +362,7 @@ kolla_enable_neutron: "yes"
kolla_enable_neutron_lbaas: "no"
kolla_enable_neutron_provider_networks: "no"
kolla_enable_nova: "yes"
kolla_enable_octavia: "no"
kolla_enable_osprofiler: "no"
kolla_enable_prometheus: "no"
kolla_enable_sahara: "no"

View File

@ -380,6 +380,12 @@ kolla_enable_nova:
# Free form extra configuration to append to nova.conf.
kolla_extra_nova:
###############################################################################
# Octavia configuration.
# Whether to enable Octavia.
kolla_enable_octavia:
###############################################################################
# Sahara configuration.

View File

@ -80,6 +80,7 @@ provisioner:
kolla_extra_nova: |
[extra-nova.conf]
foo=bar
kolla_enable_octavia: true
kolla_enable_sahara: true
kolla_extra_sahara: |
[extra-sahara.conf]

View File

@ -46,6 +46,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
'murano',
'neutron',
'nova',
'octavia',
'sahara',
'storm',
'swift',

View File

@ -129,6 +129,11 @@ kolla_openstack_custom_config:
dest: "{{ kolla_node_custom_config_path }}/nova"
patterns: "*"
enabled: "{{ kolla_enable_nova }}"
# Octavia.
- src: "{{ kolla_extra_config_path }}/octavia"
dest: "{{ kolla_node_custom_config_path }}/octavia"
patterns: "*"
enabled: "{{ kolla_enable_octavia }}"
# Sahara.
- src: "{{ kolla_extra_config_path }}/sahara"
dest: "{{ kolla_node_custom_config_path }}/sahara"