Remove deprcated mysql_module
This has been deprecated and non-functional for awhile, remove it. Change-Id: Ibc556b1d5c698d343853e1414c4e7861b0999e66
This commit is contained in:
parent
580582530b
commit
d79020d163
@ -36,9 +36,6 @@
|
||||
#
|
||||
# === Deprecated Parameters
|
||||
#
|
||||
# [*mysql_module*]
|
||||
# (Optional) Does nothing.
|
||||
#
|
||||
# == Dependencies
|
||||
# Class['mysql::server']
|
||||
#
|
||||
@ -58,14 +55,9 @@ class keystone::db::mysql(
|
||||
$host = '127.0.0.1',
|
||||
$charset = 'utf8',
|
||||
$collate = 'utf8_general_ci',
|
||||
$mysql_module = undef,
|
||||
$allowed_hosts = undef
|
||||
) {
|
||||
|
||||
if $mysql_module {
|
||||
warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
|
||||
}
|
||||
|
||||
validate_string($password)
|
||||
|
||||
::openstacklib::db::mysql { 'keystone':
|
||||
|
@ -318,9 +318,6 @@
|
||||
# (string value)
|
||||
# Defaults to '/C=US/ST=Unset/L=Unset/O=Unset/CN=localhost'
|
||||
#
|
||||
# [*mysql_module*]
|
||||
# (optional) Deprecated. Does nothing.
|
||||
#
|
||||
# [*validate_service*]
|
||||
# (optional) Whether to validate keystone connections after
|
||||
# the service is started.
|
||||
@ -552,7 +549,6 @@ class keystone(
|
||||
# DEPRECATED PARAMETERS
|
||||
$admin_workers = max($::processorcount, 2),
|
||||
$public_workers = max($::processorcount, 2),
|
||||
$mysql_module = undef,
|
||||
$compute_port = undef,
|
||||
) inherits keystone::params {
|
||||
|
||||
@ -562,10 +558,6 @@ class keystone(
|
||||
validate_re($catalog_type, 'template|sql')
|
||||
}
|
||||
|
||||
if $mysql_module {
|
||||
warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
|
||||
}
|
||||
|
||||
if ($admin_endpoint and 'v2.0' in $admin_endpoint) {
|
||||
warning('Version string /v2.0/ should not be included in keystone::admin_endpoint')
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user