Merge "Include 'octavia' driver on ML2/OVN deployments"
This commit is contained in:
commit
68c445e7ea
|
@ -97,9 +97,10 @@ class tripleo::profile::base::octavia::api (
|
||||||
if ($step >= 4 and $sync_db) or ($step >= 5 and !$sync_db) {
|
if ($step >= 4 and $sync_db) or ($step >= 5 and !$sync_db) {
|
||||||
include ::octavia::controller
|
include ::octavia::controller
|
||||||
if 'ovn' in $neutron_driver {
|
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':
|
class { '::octavia::api':
|
||||||
sync_db => $sync_db,
|
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}"], ':'),
|
ovn_nb_connection => join(['tcp', normalize_ip_for_uri($ovn_db_host), "${ovn_nb_port}"], ':'),
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -117,7 +117,9 @@ eos
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'should should set provider drivers and ovn nb connection' do
|
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')
|
is_expected.to contain_class('octavia::api').with(:ovn_nb_connection => 'tcp:127.0.0.1:6641')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue