openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Fix amphora provider driver description"

Browse Source
This commit is contained in:
Zuul 2019-06-28 18:34:28 +00:00 committed by Gerrit Code Review
commit 84792bd9ca
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

@ -97,7 +97,7 @@ 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: The Octavia Amphora Driver.,octavia: Deprecated alias of the Octavia Amphora driver.,ovn: Octavia OVN driver.'
$providers = 'amphora: The Octavia Amphora driver.,octavia: Deprecated alias of the Octavia Amphora driver.,ovn: Octavia OVN driver.'
class { '::octavia::api':
sync_db => $sync_db,
provider_drivers => $providers,

2
spec/classes/tripleo_profile_base_octavia_api_spec.rb
View File

@ -119,7 +119,7 @@ eos
it 'should should set provider drivers and ovn nb connection' do
is_expected.to contain_class('octavia::api').with(
:provider_drivers =>
'amphora: The Octavia Amphora Driver.,octavia: Deprecated alias of the Octavia Amphora driver.,ovn: Octavia OVN driver.')
'amphora: The 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