From b4d9555e1d2ca626879d7a3256fee52db40bb94f Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Mon, 22 Jun 2020 11:01:43 +0900
Subject: [PATCH] Remove deprecated nova::placement::os_interface

... because the parameter was deprecated in Stein[1], and has been
deprecated for 3 cycles.

[1] b1181f62429d3b1f58d7aa884fb30c4ad8f7eb7e

Change-Id: I097db4dc137b2baf6c6acb684820fa42528c5df5
---
 manifests/placement.pp                           | 16 +---------------
 ...ent-remove-os_interface-5b02ab5f968b94b7.yaml |  4 ++++
 2 files changed, 5 insertions(+), 15 deletions(-)
 create mode 100644 releasenotes/notes/nova-placement-remove-os_interface-5b02ab5f968b94b7.yaml

diff --git a/manifests/placement.pp b/manifests/placement.pp
index 21e5723f7..683df4f95 100644
--- a/manifests/placement.pp
+++ b/manifests/placement.pp
@@ -48,13 +48,6 @@
 #   and not the Identity service API IP and port.
 #   Defaults to 'http://127.0.0.1:5000/v3'
 #
-# DEPRECATED PARAMETERS
-#
-# [*os_interface*]
-#   (optional) interface name used for getting the keystone endpoint for
-#   the placement API.
-#   Defaults to undef
-
 class nova::placement(
   $password            = false,
   $auth_type           = 'password',
@@ -65,17 +58,10 @@ class nova::placement(
   $project_name        = 'services',
   $user_domain_name    = 'Default',
   $username            = 'placement',
-  # DEPRECATED PARAMETERS
-  $os_interface        = undef,
 ) inherits nova::params {
 
   include nova::deps
 
-  if $os_interface {
-    warning('nova::placement::os_interface is deprecated for removal, please use valid_interfaces instead.')
-  }
-  $valid_interfaces_real = pick($os_interface, $valid_interfaces)
-
   nova_config {
     'placement/auth_type':           value => $auth_type;
     'placement/auth_url':            value => $auth_url;
@@ -85,7 +71,7 @@ class nova::placement(
     'placement/user_domain_name':    value => $user_domain_name;
     'placement/username':            value => $username;
     'placement/region_name':         value => $region_name;
-    'placement/valid_interfaces':    value => $valid_interfaces_real;
+    'placement/valid_interfaces':    value => $valid_interfaces;
   }
 
 }
diff --git a/releasenotes/notes/nova-placement-remove-os_interface-5b02ab5f968b94b7.yaml b/releasenotes/notes/nova-placement-remove-os_interface-5b02ab5f968b94b7.yaml
new file mode 100644
index 000000000..ff9b664ad
--- /dev/null
+++ b/releasenotes/notes/nova-placement-remove-os_interface-5b02ab5f968b94b7.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    The ``nova::placement::os_interface`` parameter has been removed.