From 0fef741b829c8c9ca59d9c8667ce83ac5d5377db Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 7 Feb 2018 15:02:51 +0800
Subject: [PATCH] Remove deprecated enable_v1/v2_api options

The enable_v1/v2_api options have been deprecated in Mitaka.
we can remove them.

Change-Id: I484a1766da2579e382551b78c848c2ea5d244f8a
---
 manifests/init.pp                              | 18 ------------------
 ...able_v1_v2_api_option-135a8933ef7613d0.yaml |  4 ++++
 2 files changed, 4 insertions(+), 18 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_enable_v1_v2_api_option-135a8933ef7613d0.yaml

diff --git a/manifests/init.pp b/manifests/init.pp
index d58b6536..bf601020 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -248,14 +248,6 @@
 #
 # === DEPRECATED PARAMETERS
 #
-# [*enable_v1_api*]
-#   (Optional) DEPRECATED. Whether to enable the v1 API (true/false).
-#   Defaults to undef.
-#
-# [*enable_v2_api*]
-#   (Optional) DEPRECATED. Whether to enable the v2 API (true/false).
-#   Defaults to undef.
-#
 # [*use_ssl*]
 #   (optional) DEPRECATED. Enable SSL on the API server
 #   Defaults to undef
@@ -365,8 +357,6 @@ class cinder (
   $purge_config                       = false,
   $backend_host                       = $::os_service_default,
   # DEPRECATED PARAMETERS
-  $enable_v1_api                      = undef,
-  $enable_v2_api                      = undef,
   $use_ssl                            = undef,
   $ca_file                            = undef,
   $cert_file                          = undef,
@@ -385,14 +375,6 @@ class cinder (
   include ::cinder::db
   include ::cinder::logging
 
-  if $enable_v1_api {
-    warning('enable_v1_api is deprecated, has no effect and will be removed in a future release')
-  }
-
-  if $enable_v2_api {
-    warning('enable_v2_api is deprecated, has no effect and will be removed in a future release')
-  }
-
   if !is_service_default($host) {
     warning('host is deprecated, has no effect and will be removed in a future release, use backend_host instead')
   }
diff --git a/releasenotes/notes/remove_deprecated_enable_v1_v2_api_option-135a8933ef7613d0.yaml b/releasenotes/notes/remove_deprecated_enable_v1_v2_api_option-135a8933ef7613d0.yaml
new file mode 100644
index 00000000..6f419725
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_enable_v1_v2_api_option-135a8933ef7613d0.yaml
@@ -0,0 +1,4 @@
+---
+other:
+  - Remove deprecated cinder::enable_v1_api option.
+  - Remove deprecated cinder::enable_v2_api option.