From a2e3f3445cfbcbc995451abc165695fa8a7aaa68 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Wed, 17 Apr 2019 15:18:18 +0530 Subject: [PATCH] Set octavia provider_drivers config option correctly Change-Id: I4cb95de0cd963899d2db7e08704ed734e87751d7 Depends-On: https://review.opendev.org/655105 Partial-Bug: #1825146 (cherry picked from commit 2a1167dd7b99f5ba5040b2cd90f897a26e590e77) --- manifests/profile/base/octavia/api.pp | 2 +- spec/classes/tripleo_profile_base_octavia_api_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/profile/base/octavia/api.pp b/manifests/profile/base/octavia/api.pp index 5a6b8ba84..04f00e4dd 100644 --- a/manifests/profile/base/octavia/api.pp +++ b/manifests/profile/base/octavia/api.pp @@ -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': diff --git a/spec/classes/tripleo_profile_base_octavia_api_spec.rb b/spec/classes/tripleo_profile_base_octavia_api_spec.rb index c2e5e231d..ec469bf04 100644 --- a/spec/classes/tripleo_profile_base_octavia_api_spec.rb +++ b/spec/classes/tripleo_profile_base_octavia_api_spec.rb @@ -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