openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Set octavia provider_drivers config option correctly"

This commit is contained in:
Zuul 2019-04-22 20:07:17 +00:00 committed by Gerrit Code Review
parent 42642c450b 2a1167dd7b
commit 03b94bfb9d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,7 @@ class tripleo::profile::base::octavia::api (
if 'ovn' in $neutron_driver {
class { '::octavia::api':
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 {
class { '::octavia::api':

2
spec/classes/tripleo_profile_base_octavia_api_spec.rb
View File

@ -115,7 +115,7 @@ eos
end
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