Merge "Set octavia provider_drivers config option correctly"
This commit is contained in:
commit
03b94bfb9d
@ -89,7 +89,7 @@ class tripleo::profile::base::octavia::api (
|
|||||||
if 'ovn' in $neutron_driver {
|
if 'ovn' in $neutron_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 => 'amphora: Octavia Amphora Driver, ovn: Octavia OVN driver',
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
class { '::octavia::api':
|
class { '::octavia::api':
|
||||||
|
@ -115,7 +115,7 @@ eos
|
|||||||
end
|
end
|
||||||
|
|
||||||
it 'should should set provider drivers' do
|
it 'should should set provider drivers' 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, ovn: Octavia OVN driver')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user