Merge "Remove deprecated authtoken parameters of the base class"

manifests/init.pp

@@ -207,41 +207,6 @@
 #   in the murano config.
 #   Defaults to false.
 #
-# === Deprecated Parameters
-#
-# [*identity_uri*]
-#  (Optional) Admin identity endpoint
-#  Defaults to undef.
-#
-# [*admin_user*]
-#  (Optional) Username for murano credentials
-#  Defaults to undef.
-#
-# [*admin_password*]
-#  (Optional) Password for murano credentials
-#  Defaults to undef.
-#
-# [*admin_tenant_name*]
-#  (Optional) Tenant for admin_username
-#  Defaults to undef.
-#
-# [*www_authenticate_uri*]
-#  (Optional) Public identity endpoint
-#  Defaults to undef.
-#
-# [*user_domain_name*]
-#   (Optional) Name of domain for $username
-#   Defaults to undef.
-#
-# [*project_domain_name*]
-#   (Optional) Name of domain for $project_name
-#   Defaults to undef.
-#
-# [*memcached_servers*]
-#   (optional) a list of memcached server(s) to use for caching. If left
-#   undefined, tokens will instead be cached in-process.
-#   Defaults to undef.
-#
 class murano(
   $package_ensure             = 'present',
   $data_dir                   = '/var/cache/murano',
@@ -289,25 +254,12 @@ class murano(
   $sync_db                    = true,
   $purge_config               = false,
   $amqp_durable_queues        = $::os_service_default,
-  # Deprecated
-  $identity_uri               = undef,
-  $admin_user                 = undef,
-  $admin_password             = undef,
-  $admin_tenant_name          = undef,
-  $www_authenticate_uri       = undef,
-  $user_domain_name           = undef,
-  $project_domain_name        = undef,
-  $memcached_servers          = undef,
 ) inherits murano::params {
 
   include murano::deps
   include murano::policy
   include murano::db
 
-  if $admin_password != undef {
-    validate_legacy(String, 'validate_string', $admin_password)
-  }
-
   package { 'murano-common':
     ensure => $package_ensure,
     name   => $::murano::params::common_package_name,
@@ -382,22 +334,6 @@ class murano(
     'engine/packages_service': value => $packages_service,
   }
 
-  [
-    'www_authenticate_uri',
-    'identity_uri',
-    'admin_user',
-    'admin_password',
-    'admin_domain_name',
-    'user_domain_name',
-    'project_domain_name',
-    'memcached_servers'
-  ].each |String $opt| {
-    if getvar($opt) != undef {
-      warning("The ${opt} parameter is deprecated. Use the murano::keystone::authtoken class instead")
-      include murano::keystone::authtoken
-    }
-  }
-
   oslo::messaging::rabbit { 'murano_config':
     kombu_ssl_version       => $kombu_ssl_version,
     kombu_ssl_keyfile       => $kombu_ssl_keyfile,

manifests/keystone/authtoken.pp

@@ -191,7 +191,7 @@
 #  Defaults to $::os_service_default.
 #
 class murano::keystone::authtoken(
-  $password                       = $::os_service_default,
+  $password,
   $username                       = 'murano',
   $auth_url                       = 'http://localhost:5000',
   $project_name                   = 'services',
@@ -232,30 +232,17 @@ class murano::keystone::authtoken(
 
   include murano::deps
 
-  $www_authenticate_uri_real = pick($::murano::www_authenticate_uri, $www_authenticate_uri)
-  $auth_url_real             = pick($::murano::identity_uri, $auth_url)
-  $username_real             = pick($::murano::admin_user, $username)
-  $password_real             = pick($::murano::admin_password, $password)
-  $project_name_real         = pick($::murano::admin_tenant_name, $project_name)
-  $user_domain_name_real     = pick($::murano::user_domain_name, $user_domain_name)
-  $project_domain_name_real  = pick($::murano::project_domain_name, $project_domain_name)
-  $memcached_servers_real    = pick($::murano::memcached_servers, $memcached_servers)
-
-  if is_service_default($password_real) {
-    fail('The password parameter should be set')
-  }
-
   keystone::resource::authtoken { 'murano_config':
-    username                       => $username_real,
-    password                       => $password_real,
-    project_name                   => $project_name_real,
-    auth_url                       => $auth_url_real,
-    www_authenticate_uri           => $www_authenticate_uri_real,
+    username                       => $username,
+    password                       => $password,
+    project_name                   => $project_name,
+    auth_url                       => $auth_url,
+    www_authenticate_uri           => $www_authenticate_uri,
     auth_version                   => $auth_version,
     auth_type                      => $auth_type,
     auth_section                   => $auth_section,
-    user_domain_name               => $user_domain_name_real,
-    project_domain_name            => $project_domain_name_real,
+    user_domain_name               => $user_domain_name,
+    project_domain_name            => $project_domain_name,
     system_scope                   => $system_scope,
     insecure                       => $insecure,
     cache                          => $cache,
@@ -275,7 +262,7 @@ class murano::keystone::authtoken(
     memcache_security_strategy     => $memcache_security_strategy,
     memcache_use_advanced_pool     => $memcache_use_advanced_pool,
     memcache_pool_unused_timeout   => $memcache_pool_unused_timeout,
-    memcached_servers              => $memcached_servers_real,
+    memcached_servers              => $memcached_servers,
     manage_memcache_package        => $manage_memcache_package,
     region_name                    => $region_name,
     token_cache_time               => $token_cache_time,

releasenotes/notes/authtoken-opts-cleanup-61c3de270f678570.yaml

@@ -0,0 +1,14 @@
+---
+upgrade:
+  - |
+    The following parameters of the ``murano`` class have been removed.
+
+    - ``www_authenticate_uri``
+    - ``identity_uri``
+    - ``admin_user``
+    - ``admin_password``
+    - ``admin_tenant_name``
+    - ``user_domain_name``
+    - ``project_domain_name``
+    - ``memcached_servers``
+