openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Enable octavia driver agent puppet" into stable/wallaby

This commit is contained in:
Zuul 2022-07-26 22:06:29 +00:00 committed by Gerrit Code Review
parent 525ceb736d 0648957fab
commit c8102debad
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/octavia/octavia-api-container-puppet.yaml
View File

@ -264,6 +264,10 @@ outputs:
list_join:
- "\n"
- - "include tripleo::profile::base::octavia::api"
- if:
- {get_param: OctaviaEnableDriverAgent}
- "include octavia::driver_agent"
- ""
- {get_attr: [OctaviaProviderConfig, role_data, step_config]}
- {get_attr: [MySQLClient, role_data, step_config]}
config_image: {get_param: ContainerOctaviaConfigImage}

29
deployment/octavia/providers/ovn-provider-config.yaml
View File

@ -67,20 +67,23 @@ outputs:
value:
config_settings:
map_merge:
-
if:
- octavia_provider_ovn_protocol_unset
- if:
- internal_tls_enabled
- tripleo::profile::base::octavia::provider::ovn::protocol: 'ssl'
- tripleo::profile::base::octavia::provider::ovn::protocol: 'tcp'
- tripleo::profile::base::octavia::provider::ovn::protocol: {get_param: OctaviaOvnProviderProtocol}
- if:
- ovn_and_tls
- tripleo::profile::base::octavia::provider::ovn::ovn_nb_ca_cert: {get_param: InternalTLSCAFile}
tripleo::profile::base::octavia::provider::ovn::ovn_nb_certificate: '/etc/pki/tls/certs/ovn_octavia.crt'
tripleo::profile::base::octavia::provider::ovn::ovn_nb_private_key: '/etc/pki/tls/private/ovn_octavia.key'
- if:
- is_ovn_in_neutron_mechanism_driver
- octavia::driver_agent::enabled_provider_agents: 'ovn'
- {}
- if:
- octavia_provider_ovn_protocol_unset
- if:
- internal_tls_enabled
- tripleo::profile::base::octavia::provider::ovn::protocol: 'ssl'
- tripleo::profile::base::octavia::provider::ovn::protocol: 'tcp'
- tripleo::profile::base::octavia::provider::ovn::protocol: {get_param: OctaviaOvnProviderProtocol}
- if:
- ovn_and_tls
- tripleo::profile::base::octavia::provider::ovn::ovn_nb_ca_cert: {get_param: InternalTLSCAFile}
tripleo::profile::base::octavia::provider::ovn::ovn_nb_certificate: '/etc/pki/tls/certs/ovn_octavia.crt'
tripleo::profile::base::octavia::provider::ovn::ovn_nb_private_key: '/etc/pki/tls/private/ovn_octavia.key'
- {}
puppet_tags: octavia_ovn_provider_config
provider_driver_labels:
if: