openstack/puppet-neutron
Code Issues Proposed changes

Deprecate nova_url parameter

Browse Source 
nova_url parameter is not used by Neutron. The param is now deprecated
in puppet-neutron and will be removed in a future release after Newton.

Change-Id: I379741f47345b775b2637633bd3a1539446129c0
This commit is contained in:
Emilien Macchi 2016-05-10 15:20:11 -04:00
parent 1ead3cfa3d
commit d220fb55f4
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/server/notifications.pp
View File

@ -30,11 +30,6 @@
# any events to send.
# Defaults to $::os_service_default
#
# [*nova_url*]
# (optional) URL for connection to nova (Only supports one nova region
# currently).
# Defaults to 'http://127.0.0.1:8774/v2'
#
# [*auth_type*]
# (optional) An authentication type to use with an OpenStack Identity server.
# The value should contain auth plugin name
@ -117,12 +112,16 @@
# An authentication plugin to use with an OpenStack Identity server.
# Defaults to $::os_service_default
#
# [*nova_url*]
# Deprecated URL for connection to nova (Only supports one nova region
# currently).
# Defaults to $::os_service_default
#
class neutron::server::notifications (
$notify_nova_on_port_status_changes = true,
$notify_nova_on_port_data_changes = true,
$send_events_interval = $::os_service_default,
$nova_url = 'http://127.0.0.1:8774/v2',
$auth_type = 'password',
$username = 'nova',
$password = false,
@ -141,6 +140,7 @@ class neutron::server::notifications (
$nova_admin_password = false,
$nova_region_name = $::os_service_default,
$auth_plugin = $::os_service_default,
$nova_url = $::os_service_default,
) {
# Depend on the specified keystone_user resource, if it exists.
@ -158,6 +158,10 @@ class neutron::server::notifications (
fail('You must provide either tenant_name or tenant_id.')
}
if $nova_url {
warning('nova_url is deprecated and will be removed after Newton cycle.')
}
if $nova_admin_password {
warning('nova_admin-* and nova_region_name parameters are deprecated and will be removed in a future release')
neutron_config {

4
releasenotes/notes/nova_url_deprec-b4a7a8896bbfb201.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- nova_url parameter is deprecated, will be removed after Newton
cycle. The parameter is not used anymore by Neutron.

2
spec/classes/neutron_server_notifications_spec.rb
View File

@ -24,7 +24,6 @@ describe 'neutron::server::notifications' do
{
:notify_nova_on_port_status_changes => true,
:notify_nova_on_port_data_changes => true,
:nova_url => 'http://127.0.0.1:8774/v2',
:auth_type => 'password',
:username => 'nova',
:tenant_name => 'services',
@ -59,7 +58,6 @@ describe 'neutron::server::notifications' do
is_expected.to contain_neutron_config('DEFAULT/notify_nova_on_port_status_changes').with_value(true)
is_expected.to contain_neutron_config('DEFAULT/notify_nova_on_port_data_changes').with_value(true)
is_expected.to contain_neutron_config('DEFAULT/send_events_interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_config('DEFAULT/nova_url').with_value('http://127.0.0.1:8774/v2')
is_expected.to contain_neutron_config('nova/auth_type').with_value('password')
is_expected.to contain_neutron_config('nova/auth_url').with_value('http://127.0.0.1:35357')
is_expected.to contain_neutron_config('nova/username').with_value('nova')