diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 166c0da7..abd7017c 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -52,14 +52,6 @@ # (Optional) List of interfaces, in order of preference for endpoint URL. # Defaults to $facts['os_service_default'] # -# [*endpoint*] -# (Optional) Custom neutron endpoint if override is necessary. -# Defaults to $facts['os_service_default'] -# -# [*endpoint_type*] -# (Optional) Endpoint type in catalog to use for neutron. -# Defaults to $facts['os_service_default'] -# class octavia::neutron ( $auth_url = 'http://localhost:5000', $username = 'neutron', @@ -73,21 +65,10 @@ class octavia::neutron ( $service_name = $facts['os_service_default'], $endpoint_override = $facts['os_service_default'], $valid_interfaces = $facts['os_service_default'], - # DEPRECATED PARMAETERS - $endpoint = undef, - $endpoint_type = undef, ) { include octavia::deps - if $endpoint != undef { - warning('The endpoint parameter is deprecated. Use endpoint_override.') - } - - if $endpoint_type != undef { - warning('The endpoint_type parameter is deprecated. Use valid_interfaces.') - } - if is_service_default($password) { warning('[neutron] section will require valid credential options in a future release') } @@ -113,7 +94,5 @@ class octavia::neutron ( 'neutron/service_name': value => $service_name; 'neutron/endpoint_override': value => $endpoint_override; 'neutron/valid_interfaces': value => join(any2array($valid_interfaces), ','); - 'neutron/endpoint': value => pick($endpoint, $facts['os_service_default']); - 'neutron/endpoint_type': value => pick($endpoint_type, $facts['os_service_default']); } } diff --git a/releasenotes/notes/remove-deprecated-neutron-opts-7c661594cb70fcf5.yaml b/releasenotes/notes/remove-deprecated-neutron-opts-7c661594cb70fcf5.yaml new file mode 100644 index 00000000..d307beeb --- /dev/null +++ b/releasenotes/notes/remove-deprecated-neutron-opts-7c661594cb70fcf5.yaml @@ -0,0 +1,8 @@ +--- +upgrade: + - | + The following parameters of the ``octavia::neutron`` class have been + removed. + + - ``endpoint`` + - ``endpoint_type`` diff --git a/spec/classes/octavia_neutron_spec.rb b/spec/classes/octavia_neutron_spec.rb index 39e6e171..0f314558 100644 --- a/spec/classes/octavia_neutron_spec.rb +++ b/spec/classes/octavia_neutron_spec.rb @@ -16,9 +16,6 @@ describe 'octavia::neutron' do is_expected.to contain_octavia_config('neutron/service_name').with_value('') is_expected.to contain_octavia_config('neutron/endpoint_override').with_value('') is_expected.to contain_octavia_config('neutron/valid_interfaces').with_value('') - - is_expected.to contain_octavia_config('neutron/endpoint').with_value('') - is_expected.to contain_octavia_config('neutron/endpoint_type').with_value('') } end @@ -55,20 +52,6 @@ describe 'octavia::neutron' do } end - context 'with deprecated parameters' do - let :params do - { - :endpoint => 'http://127.0.0.1:9696', - :endpoint_type => 'internalURL', - } - end - - it { - is_expected.to contain_octavia_config('neutron/endpoint').with_value('http://127.0.0.1:9696') - is_expected.to contain_octavia_config('neutron/endpoint_type').with_value('internalURL') - } - end - context 'when system_scope is set' do let :params do {