From c794aa6e64f13840db6f8870e22d51e21be81e58 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 6 May 2020 14:28:42 +0900 Subject: [PATCH] Remove v1 api support ... because it was deprecated long ago in puppet-designate, and actual implementation was already removed from designate[1]. [1] c318106c01b2b3976049f2c3ba0c8502a874242b Change-Id: I121e06e5586d574aa63e4fd0b6553d414e227caf --- manifests/api.pp | 10 ---------- releasenotes/notes/remove-v1-api-0b47239b7ea1a4a0.yaml | 4 ++++ spec/classes/designate_api_spec.rb | 3 --- 3 files changed, 4 insertions(+), 13 deletions(-) create mode 100644 releasenotes/notes/remove-v1-api-0b47239b7ea1a4a0.yaml diff --git a/manifests/api.pp b/manifests/api.pp index b32646b4..9ffced86 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -25,10 +25,6 @@ # "keystone". # Defaults to $::os_service_default # -# [*enable_api_v1*] -# (optional) Enable Designate API Version 1 (deprecated). -# Defaults to $::os_service_default -# # [*enable_api_v2*] # (optional) Enable Designate API Version 2. # Defaults to $::os_service_default @@ -98,7 +94,6 @@ class designate::api ( $enabled = true, $service_ensure = 'running', $auth_strategy = $::os_service_default, - $enable_api_v1 = $::os_service_default, $enable_api_v2 = $::os_service_default, $enable_api_admin = $::os_service_default, $api_base_uri = $::os_service_default, @@ -119,15 +114,10 @@ class designate::api ( include designate::deps - if !is_service_default($enable_api_v1) { - warning('Version 1 of API is deprecated.') - } - # API Service designate_config { 'service:api/listen' : value => $listen; 'service:api/auth_strategy' : value => $auth_strategy; - 'service:api/enable_api_v1' : value => $enable_api_v1; 'service:api/enable_api_v2' : value => $enable_api_v2; 'service:api/enable_api_admin' : value => $enable_api_admin; 'service:api/api_base_uri' : value => $api_base_uri; diff --git a/releasenotes/notes/remove-v1-api-0b47239b7ea1a4a0.yaml b/releasenotes/notes/remove-v1-api-0b47239b7ea1a4a0.yaml new file mode 100644 index 00000000..4cb643b1 --- /dev/null +++ b/releasenotes/notes/remove-v1-api-0b47239b7ea1a4a0.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - | + The ``designate::api::enable_v1_api`` parameter has been removed. diff --git a/spec/classes/designate_api_spec.rb b/spec/classes/designate_api_spec.rb index 0ed277cb..588a193e 100644 --- a/spec/classes/designate_api_spec.rb +++ b/spec/classes/designate_api_spec.rb @@ -33,7 +33,6 @@ describe 'designate::api' do it 'configures designate-api with default parameters' do is_expected.to contain_designate_config('service:api/auth_strategy').with_value('') - is_expected.to contain_designate_config('service:api/enable_api_v1').with_value('') is_expected.to contain_designate_config('service:api/enable_api_v2').with_value('') is_expected.to contain_designate_config('service:api/enable_api_admin').with_value('') is_expected.to contain_designate_config('service:api/api_base_uri').with_value('') @@ -58,7 +57,6 @@ describe 'designate::api' do before do params.merge!({ :auth_strategy => 'noauth', - :enable_api_v1 => false, :enable_api_v2 => true, :enable_api_admin => true, :api_base_uri => 'http://myhost.es:9001/', @@ -80,7 +78,6 @@ describe 'designate::api' do it 'configure service_api' do is_expected.to contain_designate_config('service:api/auth_strategy').with_value(params[:auth_strategy]) - is_expected.to contain_designate_config('service:api/enable_api_v1').with_value(params[:enable_api_v1]) is_expected.to contain_designate_config('service:api/enable_api_v2').with_value(params[:enable_api_v2]) is_expected.to contain_designate_config('service:api/enable_api_admin').with_value(params[:enable_api_admin]) is_expected.to contain_designate_config('service:api/api_base_uri').with_value(params[:api_base_uri])