From fd80d3812daaa003baf88fb437a22d73e5ca15f3 Mon Sep 17 00:00:00 2001
From: Yaguang Tang <tangyg2@lenovo.com>
Date: Sat, 8 Jul 2017 18:09:09 +0800
Subject: [PATCH] Remove Nova API v3 endpoint auth options

This can be safely removed after Newton release, and Nova already has
no support for V3 API.

Change-Id: Ic91f3b2e29a880be3ba32868d1e5e2d370449020
---
 manifests/keystone/auth.pp                    | 44 -------------------
 ...emove-v3api-endpoint-69f2e645efb0a7c8.yaml |  3 ++
 2 files changed, 3 insertions(+), 44 deletions(-)
 create mode 100644 releasenotes/notes/remove-v3api-endpoint-69f2e645efb0a7c8.yaml

diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 3f500c9a6..ea6777d65 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -55,36 +55,6 @@
 #   (optional) Whether to configure the admin role for the service user.
 #   Defaults to true
 #
-# DEPRECATED PARAMETERS
-#
-# [*public_url_v3*]
-#   (optional) Deprecated. The v3 endpoint's public url.
-#   Defaults to undef.
-#
-# [*internal_url_v3*]
-#   (optional) Deprecated. The v3 endpoint's internal url.
-#   Defaults to undef.
-#
-# [*admin_url_v3*]
-#   (optional) DEPRECATED The v3 endpoint's admin url.
-#   Defaults to undef.
-#
-# [*service_description_v3*]
-#   (optional) Deprecated. Description for keystone v3 service.
-#   Defaults to undef.
-#
-# [*service_name_v3*]
-#   (optional) Deprecated. Name of the v3 service.
-#   Defaults to undef.
-#
-# [*auth_name_v3*]
-#   (optional) Deprecated. The name of the nova v3 service user
-#   Defaults to undef.
-#
-# [*configure_endpoint_v3*]
-#   (optional) Deprecated. Whether to create the v3 endpoint.
-#   Defaults to undef.
-#
 class nova::keystone::auth(
   $password,
   $auth_name               = 'nova',
@@ -99,24 +69,10 @@ class nova::keystone::auth(
   $configure_endpoint      = true,
   $configure_user          = true,
   $configure_user_role     = true,
-  # DEPRECATED PARAMETERS
-  $auth_name_v3            = undef,
-  $service_description_v3  = undef,
-  $service_name_v3         = undef,
-  $public_url_v3           = undef,
-  $internal_url_v3         = undef,
-  $admin_url_v3            = undef,
-  $configure_endpoint_v3   = undef,
 ) {
 
   include ::nova::deps
 
-  if $auth_name_v3 or $service_description_v3 or $service_name_v3 or
-      $public_url_v3 or $internal_url_v3 or $admin_url_v3 or $configure_endpoint_v3 {
-
-    warning("all parameters related to v3 API in nova::keystone::auth are \
-deprecated, have no effect and will be removed after Newton release.")
-  }
 
   if $configure_endpoint {
     Keystone_endpoint["${region}/${service_name}::compute"] ~> Service <| name == 'nova-api' |>
diff --git a/releasenotes/notes/remove-v3api-endpoint-69f2e645efb0a7c8.yaml b/releasenotes/notes/remove-v3api-endpoint-69f2e645efb0a7c8.yaml
new file mode 100644
index 000000000..183b5ff93
--- /dev/null
+++ b/releasenotes/notes/remove-v3api-endpoint-69f2e645efb0a7c8.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Remove Nova API v3 endpoint options which deprecated before Newton.