diff --git a/manifests/api.pp b/manifests/api.pp index b5347af9..d3b97b8d 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -119,12 +119,6 @@ # (optional) Allow PROMETHEUS type listeners. # Defaults to $facts['os_service_default'] # -# DEPRECATED PARAMETERS -# -# [*provider_drivers*] -# (optional) Configure the loadbalancer provider drivers. -# Defaults to undef -# class octavia::api ( Boolean $enabled = true, Boolean $manage_service = true, @@ -153,19 +147,12 @@ class octavia::api ( $minimum_tls_version = $facts['os_service_default'], $allow_ping_health_monitors = $facts['os_service_default'], $allow_prometheus_listeners = $facts['os_service_default'], - # DEPRECATED PARAMETERS - $provider_drivers = undef, ) inherits octavia::params { include octavia::deps include octavia::policy include octavia::db - if $provider_drivers != undef { - warning('The provider_drivers parameter is deprecated. \ -Use the enabled_provider_drivers parameter instead.') - } - if $auth_strategy == 'keystone' { include octavia::keystone::authtoken } @@ -215,11 +202,10 @@ running as a standalone service, or httpd for being run by a httpd server") include octavia::db::sync } - $enabled_provider_drivers_raw = pick($provider_drivers, $enabled_provider_drivers) - if $enabled_provider_drivers_raw =~ Hash { - $enabled_provider_drivers_real = join(join_keys_to_values($enabled_provider_drivers_raw, ':'), ',') + if $enabled_provider_drivers =~ Hash { + $enabled_provider_drivers_real = join(join_keys_to_values($enabled_provider_drivers, ':'), ',') } else { - $enabled_provider_drivers_real = join(any2array($enabled_provider_drivers_raw), ',') + $enabled_provider_drivers_real = join(any2array($enabled_provider_drivers), ',') } octavia_config { diff --git a/releasenotes/notes/remove-api-provider_drivers-61afe0c19e9d6189.yaml b/releasenotes/notes/remove-api-provider_drivers-61afe0c19e9d6189.yaml new file mode 100644 index 00000000..e9c35b05 --- /dev/null +++ b/releasenotes/notes/remove-api-provider_drivers-61afe0c19e9d6189.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The deprecated ``octavia::api::provider_drivers`` parameter has been + removed. Use the ``enabled_provider_drivers`` parameter instead. diff --git a/spec/classes/octavia_api_spec.rb b/spec/classes/octavia_api_spec.rb index 30f4db6b..d5149e21 100644 --- a/spec/classes/octavia_api_spec.rb +++ b/spec/classes/octavia_api_spec.rb @@ -219,18 +219,6 @@ describe 'octavia::api' do .with_value('amphora:Octavia Amphora driver,ovn:Octavia OVN driver') end end - - context 'with deprecated provider_drivers in hash' do - before do - params.merge!({ - :provider_drivers => 'amphora:Octavia Amphora driver,ovn:Octavia OVN driver' - }) - end - it 'configures parameters' do - is_expected.to contain_octavia_config('api_settings/enabled_provider_drivers')\ - .with_value('amphora:Octavia Amphora driver,ovn:Octavia OVN driver') - end - end end shared_examples 'octavia-api wsgi' do