openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Include 'octavia' driver on ML2/OVN deployments"

This commit is contained in:
Zuul 2019-05-21 20:03:14 +00:00 committed by Gerrit Code Review
parent 7759b99956 1ae89eb002
commit 68c445e7ea
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/profile/base/octavia/api.pp
View File

@ -97,9 +97,10 @@ class tripleo::profile::base::octavia::api (
if ($step >= 4 and $sync_db) or ($step >= 5 and !$sync_db) {
include ::octavia::controller
if 'ovn' in $neutron_driver {
$providers = 'amphora: Octavia Amphora Driver.,octavia: Deprecated alias of the Octavia Amphora driver.,ovn: Octavia OVN driver.'
class { '::octavia::api':
sync_db => $sync_db,
provider_drivers => 'amphora: Octavia Amphora Driver, ovn: Octavia OVN driver',
provider_drivers => $providers,
ovn_nb_connection => join(['tcp', normalize_ip_for_uri($ovn_db_host), "${ovn_nb_port}"], ':'),
}
} else {

4
spec/classes/tripleo_profile_base_octavia_api_spec.rb
View File

@ -117,7 +117,9 @@ eos
end
it 'should should set provider drivers and ovn nb connection' do
is_expected.to contain_class('octavia::api').with(:provider_drivers => 'amphora: Octavia Amphora Driver, ovn: Octavia OVN driver')
is_expected.to contain_class('octavia::api').with(
:provider_drivers =>
'amphora: Octavia Amphora Driver.,octavia: Deprecated alias of the Octavia Amphora driver.,ovn: Octavia OVN driver.')
is_expected.to contain_class('octavia::api').with(:ovn_nb_connection => 'tcp:127.0.0.1:6641')
end
end