From 5e9324e62f96ca2128548b95341b9376f400f85d Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 15 Nov 2022 10:58:08 +0900
Subject: [PATCH] ovn-metadata: Remove deprecated metadata_ip

The parameter was deprecated during the previous cycle[1], because
the actual parameter in Neutron had been removed a long ago.

[1] 189d7d6bea084b0298e5490c43157018a330f5c4

Change-Id: Id07aa47e723b44d53aaac02bbdb3f0b4e8d72968
---
 manifests/agents/ovn_metadata.pp                  | 15 ---------------
 ...ovn_metadata-metadata_ip-a83b5fbf0cc7a630.yaml |  5 +++++
 2 files changed, 5 insertions(+), 15 deletions(-)
 create mode 100644 releasenotes/notes/remove-ovn_metadata-metadata_ip-a83b5fbf0cc7a630.yaml

diff --git a/manifests/agents/ovn_metadata.pp b/manifests/agents/ovn_metadata.pp
index 11b93f9c8..4e087f9ab 100644
--- a/manifests/agents/ovn_metadata.pp
+++ b/manifests/agents/ovn_metadata.pp
@@ -112,12 +112,6 @@
 #   in the metadata config.
 #   Defaults to false.
 #
-# DEPRECATED PARAMETERS
-#
-# [*metadata_ip*]
-#   The IP address of the metadata service.
-#   Defaults to undef
-#
 class neutron::agents::ovn_metadata (
   $shared_secret,
   $package_ensure            = 'present',
@@ -146,20 +140,11 @@ class neutron::agents::ovn_metadata (
   $root_helper_daemon        = $::os_service_default,
   $state_path                = '/var/lib/neutron',
   $purge_config              = false,
-  # DEPRECATED PARAMETERS
-  $metadata_ip               = undef,
   ) {
 
   include neutron::deps
   include neutron::params
 
-  if $metadata_ip != undef {
-    warning('The metadata_ip parameter is deprecated and has no effect')
-  }
-  ovn_metadata_agent_config {
-    'DEFAULT/nova_metadata_ip': ensure => absent;
-  }
-
   resources { 'ovn_metadata_agent_config':
     purge => $purge_config,
   }
diff --git a/releasenotes/notes/remove-ovn_metadata-metadata_ip-a83b5fbf0cc7a630.yaml b/releasenotes/notes/remove-ovn_metadata-metadata_ip-a83b5fbf0cc7a630.yaml
new file mode 100644
index 000000000..043c143f0
--- /dev/null
+++ b/releasenotes/notes/remove-ovn_metadata-metadata_ip-a83b5fbf0cc7a630.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    The ``neutron::agents::ovn_metadata::metadata_ip`` parameter has been
+    removed.