From 77ffbe059b42ec15c7ab501ae2e78f88f0cae0cc Mon Sep 17 00:00:00 2001 From: Gregory Thiemonge Date: Wed, 26 Jun 2019 11:15:27 +0200 Subject: [PATCH] Fix amphora provider driver description Fixed provider driver description to match octavia and octavia-tempest-plugin descriptions. See: https://opendev.org/openstack/octavia/src/branch/master/octavia/common/\ config.py\#L89 Closes-Bug: #1830702 Change-Id: I04ad7b59c1cdbef61fcd6188c09525da989020c6 --- 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 db86fcd9c..c69799b18 100644 --- a/manifests/profile/base/octavia/api.pp +++ b/manifests/profile/base/octavia/api.pp @@ -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, diff --git a/spec/classes/tripleo_profile_base_octavia_api_spec.rb b/spec/classes/tripleo_profile_base_octavia_api_spec.rb index 80017bda2..d2d59d0d9 100644 --- a/spec/classes/tripleo_profile_base_octavia_api_spec.rb +++ b/spec/classes/tripleo_profile_base_octavia_api_spec.rb @@ -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