From 3da70b1bbdff5d3de6cb197791e37d687f7704dd Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Tue, 14 Jan 2020 10:50:59 +0100
Subject: [PATCH] Remove deprecated placement::config params

These were leftovers from the nova extraction that
was wrong and should not be there.

Change-Id: Ia4ded54763eecc0f2fc07fdfa92e9cc15dccd09b
---
 manifests/config.pp                           | 79 +------------------
 ...remove-faulty-config-4a133c8e8cf74868.yaml |  7 ++
 2 files changed, 10 insertions(+), 76 deletions(-)
 create mode 100644 releasenotes/notes/remove-faulty-config-4a133c8e8cf74868.yaml

diff --git a/manifests/config.pp b/manifests/config.pp
index e812e7e..9ce901a 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -20,85 +20,12 @@
 #   NOTE: The configuration MUST NOT be already handled by this module
 #   or Puppet catalog compilation will fail with duplicate resources.
 #
-## DEPRECATED
-#
-# [*password*]
-#   (Optional) Password for connecting to Nova Placement API service in
-#   admin context through the OpenStack Identity service.
-#   Defaults to undef
-#
-# [*auth_type*]
-#   (Optional) Name of the auth type to load.
-#   Defaults to undef
-#
-# [*project_name*]
-#   (Optional) Project name for connecting to Nova Placement API service in
-#   admin context through the OpenStack Identity service.
-#   Defaults to undef
-#
-# [*project_domain_name*]
-#   (Optional) Project Domain name for connecting to Nova Placement API service in
-#   admin context through the OpenStack Identity service.
-#   Defaults to undef
-#
-# [*user_domain_name*]
-#   (Optional) User Domain name for connecting to Nova Placement API service in
-#   admin context through the OpenStack Identity service.
-#   Defaults to undef
-#
-# [*region_name*]
-#   (Optional) Region name for connecting to Nova Placement API service in admin context
-#   through the OpenStack Identity service.
-#   Defaults to undef
-#
-# [*valid_interfaces*]
-#   (Optional) Interface names used for getting the keystone endpoint for
-#   the placement API. Comma separated if multiple.
-#   Defaults to undef
-#
-# [*username*]
-#   (Optional) Username for connecting to Nova Placement API service in admin context
-#   through the OpenStack Identity service.
-#   Defaults to undef
-#
-# [*auth_url*]
-#   (Optional) Points to the OpenStack Identity server IP and port.
-#   This is the Identity (keystone) admin API server IP and port value,
-#   and not the Identity service API IP and port.
-#   Defaults to undef
-#
-class placement::config(
-  $placement_config    = {},
-  # DEPRECATED
-  $password            = undef,
-  $auth_type           = undef,
-  $auth_url            = undef,
-  $region_name         = undef,
-  $valid_interfaces    = undef,
-  $project_domain_name = undef,
-  $project_name        = undef,
-  $user_domain_name    = undef,
-  $username            = undef,
+class placement::config (
+  $placement_config = {},
 ) {
 
   include placement::deps
 
-  # TODO(tobias-urdin): Remove these deprecated ones in U release.
-  $default_parameters = {
-    'placement/auth_type'            => { ensure => 'absent' },
-    'placement/auth_url'             => { ensure => 'absent' },
-    'placement/password'             => { ensure => 'absent', secret => true },
-    'placement/project_domain_name'  => { ensure => 'absent' },
-    'placement/project_name'         => { ensure => 'absent' },
-    'placement/user_domain_name'     => { ensure => 'absent' },
-    'placement/username'             => { ensure => 'absent' },
-    'placement/region_name'          => { ensure => 'absent' },
-    'placement/valid_interfaces'     => { ensure => 'absent' },
-  }
-
-  validate_legacy(Hash, 'validate_hash', $default_parameters)
   validate_legacy(Hash, 'validate_hash', $placement_config)
-  $placement_parameters = merge($default_parameters, $placement_config)
-
-  create_resources('placement_config', $placement_parameters)
+  create_resources('placement_config', $placement_config)
 }
diff --git a/releasenotes/notes/remove-faulty-config-4a133c8e8cf74868.yaml b/releasenotes/notes/remove-faulty-config-4a133c8e8cf74868.yaml
new file mode 100644
index 0000000..f902b44
--- /dev/null
+++ b/releasenotes/notes/remove-faulty-config-4a133c8e8cf74868.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    The parameter password, auth_type, auth_url, region_name, valid_interfaces,
+    project_domain_name, project_name, user_domain_name and username in the
+    placement::config class is removed. This was faulty parameters that was
+    leftovers from when placement was extracted out of the nova module.