From 4b5404ec7429a686ae8983c33a2a82fcc672c667 Mon Sep 17 00:00:00 2001
From: zhangyangyang <zhangyangyang@unionpay.com>
Date: Fri, 6 Oct 2017 22:43:31 +0800
Subject: [PATCH] Remove some useless parameters

These parameters are useless. So they can be removed.

Change-Id: I8f65487b52e6d3801fea7abe64401adf04c58458
---
 manifests/network/neutron.pp                  | 25 -----------------
 ...ve_useless_parameter-b6a260ede152aa09.yaml | 28 +++++++++++++++++++
 2 files changed, 28 insertions(+), 25 deletions(-)
 create mode 100644 releasenotes/notes/remove_useless_parameter-b6a260ede152aa09.yaml

diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp
index 8512f7263..fbf0f9d0a 100644
--- a/manifests/network/neutron.pp
+++ b/manifests/network/neutron.pp
@@ -86,31 +86,6 @@
 #   (optional) Default pool for floating IPs
 #   Defaults to 'nova'
 #
-# DEPRECATED PARAMETERS
-# [*neutron_auth_strategy*]
-#   (optional) DEPRECATED.
-#
-# [*neutron_admin_password*]
-#   DEPRECATED. Password for connecting to Neutron network services
-#   in admin context through the OpenStack Identity service.
-#   Use neutron_password instead.
-#
-# [*neutron_admin_tenant_name*]
-#   (optional) DEPRECATED. Tenant name for connecting to Neutron network
-#   services in admin context through the OpenStack Identity service.
-#   Use neutron_project_name instead.
-#
-# [*neutron_admin_username*]
-#   (optional) DEPRECATED. Username for connecting to Neutron network services
-#   in admin context through the OpenStack Identity service.
-#   Use neutron_username instead.
-#
-# [*neutron_admin_auth_url*]
-#   (optional) DEPRECATED. Points to the OpenStack Identity server IP and port.
-#   This is the Identity (keystone) admin API server IP and port value,
-#   and not the Identity service API IP and port.
-#   Use neutron_auth_url instead.
-#
 class nova::network::neutron (
   $neutron_password                = false,
   $neutron_auth_type               = 'v3password',
diff --git a/releasenotes/notes/remove_useless_parameter-b6a260ede152aa09.yaml b/releasenotes/notes/remove_useless_parameter-b6a260ede152aa09.yaml
new file mode 100644
index 000000000..c7340d031
--- /dev/null
+++ b/releasenotes/notes/remove_useless_parameter-b6a260ede152aa09.yaml
@@ -0,0 +1,28 @@
+---
+upgrade:
+  - Remove some useless parameters
+
+    [*neutron_auth_strategy*]
+    (optional) DEPRECATED.
+
+    [*neutron_admin_password*]
+    DEPRECATED. Password for connecting to Neutron network services
+    in admin context through the OpenStack Identity service.
+    Use neutron_password instead.
+
+    [*neutron_admin_tenant_name*]
+    (optional) DEPRECATED. Tenant name for connecting to Neutron network
+    services in admin context through the OpenStack Identity service.
+    Use neutron_project_name instead.
+
+    [*neutron_admin_username*]
+    (optional) DEPRECATED. Username for connecting to Neutron network services
+    in admin context through the OpenStack Identity service.
+    Use neutron_username instead.
+
+    [*neutron_admin_auth_url*]
+    (optional) DEPRECATED. Points to the OpenStack Identity server IP and port.
+    This is the Identity (keystone) admin API server IP and port value,
+    and not the Identity service API IP and port.
+    Use neutron_auth_url instead.
+