From ec1dd390e604874c142f6163291b8047c792c583 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Sat, 4 Jan 2020 14:53:59 +0800
Subject: [PATCH] Remove keymap option

The keymap parameter has been deprecated for one year. We can remove it.

Change-Id: Ic41e8d38795ea7eb899c268dd0f6af5c3a70e8a9
---
 manifests/compute/spice.pp                           | 12 ------------
 ...ve_deprecated_keymap-option-96beecb094f35644.yaml |  3 +++
 2 files changed, 3 insertions(+), 12 deletions(-)
 create mode 100644 releasenotes/notes/remove_deprecated_keymap-option-96beecb094f35644.yaml

diff --git a/manifests/compute/spice.pp b/manifests/compute/spice.pp
index 9fb8dd0a6..0051f4559 100644
--- a/manifests/compute/spice.pp
+++ b/manifests/compute/spice.pp
@@ -33,12 +33,6 @@
 #   (optional) Path of the spice html file for the html5 console proxy
 #   Defaults to '/spice_auto.html'
 #
-# DEPRECATED PARAMETERS
-#
-# [*keymap*]
-#   (optional) keymap for spice
-#   Defaults to undef
-#
 class nova::compute::spice(
   $agent_enabled                    = true,
   $server_listen                    = undef,
@@ -47,16 +41,10 @@ class nova::compute::spice(
   $proxy_protocol                   = 'http',
   $proxy_port                       = '6082',
   $proxy_path                       = '/spice_auto.html',
-  # DEPRECATED PARAMETERS
-  $keymap                           = undef,
 ) {
 
   include nova::deps
 
-  if $keymap {
-    warning('keymap parameter is deprecated, has no effect and will be removed in the future.')
-  }
-
   if $proxy_host {
     $html5proxy_base_url = "${proxy_protocol}://${proxy_host}:${proxy_port}${proxy_path}"
     nova_config {
diff --git a/releasenotes/notes/remove_deprecated_keymap-option-96beecb094f35644.yaml b/releasenotes/notes/remove_deprecated_keymap-option-96beecb094f35644.yaml
new file mode 100644
index 000000000..d9bae5a59
--- /dev/null
+++ b/releasenotes/notes/remove_deprecated_keymap-option-96beecb094f35644.yaml
@@ -0,0 +1,3 @@
+---
+upgrade:
+  - Deprecated keymap option has been removed.