From e3c8f1423ba2f40b6f1e44cc082fddaebf17b439 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Tue, 28 Jan 2020 15:17:35 +0100
Subject: [PATCH] Remove neutron::agents::metadata::metadata_ip

Deprecated in favor of metadata_host.

Change-Id: I682e22d56d65ec160a09780f6780467b1c8718ba
---
 manifests/agents/metadata.pp                          | 11 -----------
 .../remove-nova-metadata-ip-9948a0907e0ec8a6.yaml     |  5 +++++
 2 files changed, 5 insertions(+), 11 deletions(-)
 create mode 100644 releasenotes/notes/remove-nova-metadata-ip-9948a0907e0ec8a6.yaml

diff --git a/manifests/agents/metadata.pp b/manifests/agents/metadata.pp
index 2d5e77066..9dfe2128f 100644
--- a/manifests/agents/metadata.pp
+++ b/manifests/agents/metadata.pp
@@ -63,12 +63,6 @@
 #   in the metadata config.
 #   Defaults to false.
 #
-# DEPRECATED
-#
-# [*metadata_ip*]
-#   (optional) This option is deprecated an has no effect
-#
-
 class neutron::agents::metadata (
   $shared_secret,
   $package_ensure            = 'present',
@@ -86,7 +80,6 @@ class neutron::agents::metadata (
   $nova_client_cert          = $::os_service_default,
   $nova_client_priv_key      = $::os_service_default,
   $purge_config              = false,
-  $metadata_ip               = undef,
   ) {
 
   include neutron::deps
@@ -120,10 +113,6 @@ class neutron::agents::metadata (
     }
   }
 
-  if $metadata_ip {
-    warning('nova_metadata_ip is deprecated, please use nova_metadata_host instead')
-  }
-
   if $::neutron::params::metadata_agent_package {
     package { 'neutron-metadata':
       ensure => $package_ensure,
diff --git a/releasenotes/notes/remove-nova-metadata-ip-9948a0907e0ec8a6.yaml b/releasenotes/notes/remove-nova-metadata-ip-9948a0907e0ec8a6.yaml
new file mode 100644
index 000000000..dc0245bf0
--- /dev/null
+++ b/releasenotes/notes/remove-nova-metadata-ip-9948a0907e0ec8a6.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The deprecated parameter neutron::agents::metadata::metadata_ip is removed.
+    Please use the neutron::agents::metadata::metadata_host parameter.