openstack/puppet-nova
Code Issues Proposed changes

Remove deprecated mysql_module

Browse Source 
It's been deprecated for some time, time to let go.

Change-Id: I55e161643b8e9d4145ac5e82a18c04b0767cd127
This commit is contained in:
Matt Fischer
2015-10-21 21:06:04 -06:00
parent 88385ce3ff
commit 36baeab82a
2 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/db/mysql.pp
View File

@@ -35,9 +35,6 @@
# (optional) Deprecated. Does nothing # (optional) Deprecated. Does nothing
# Defaults to 'localzone' # Defaults to 'localzone'
# #
# [*mysql_module*]
# (optional) Deprecated. Does nothing.
#
class nova::db::mysql( class nova::db::mysql(
$password, $password,
$dbname = 'nova', $dbname = 'nova',
@@ -46,13 +43,8 @@ class nova::db::mysql(
$charset = 'utf8', $charset = 'utf8',
$collate = 'utf8_general_ci', $collate = 'utf8_general_ci',
$allowed_hosts = undef, $allowed_hosts = undef,
$mysql_module = undef,
) { ) {
if $mysql_module {
warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
}
::openstacklib::db::mysql { 'nova': ::openstacklib::db::mysql { 'nova':
user => $user, user => $user,
password_hash => mysql_password($password), password_hash => mysql_password($password),

8
manifests/init.pp
View File

@@ -257,9 +257,6 @@
# 'key-data' }, where 'key-type' is one of (ssh-rsa, ssh-dsa, ssh-ecdsa) and # 'key-data' }, where 'key-type' is one of (ssh-rsa, ssh-dsa, ssh-ecdsa) and
# 'key-data' is the contents of the private key file. # 'key-data' is the contents of the private key file.
# #
# [*mysql_module*]
# (optional) Deprecated. Does nothing.
#
# [*notification_driver*] # [*notification_driver*]
# (optional) Driver or drivers to handle sending notifications. # (optional) Driver or drivers to handle sending notifications.
# Value can be a string or a list. # Value can be a string or a list.
@@ -363,17 +360,12 @@ class nova(
$os_region_name = undef, $os_region_name = undef,
$cinder_catalog_info = 'volumev2:cinderv2:publicURL', $cinder_catalog_info = 'volumev2:cinderv2:publicURL',
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$mysql_module = undef,
) inherits nova::params { ) inherits nova::params {
# maintain backward compatibility # maintain backward compatibility
include ::nova::db include ::nova::db
include ::nova::logging include ::nova::logging
if $mysql_module {
warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
}
validate_array($enabled_ssl_apis) validate_array($enabled_ssl_apis)
if empty($enabled_ssl_apis) and $use_ssl { if empty($enabled_ssl_apis) and $use_ssl {
warning('enabled_ssl_apis is empty but use_ssl is set to true') warning('enabled_ssl_apis is empty but use_ssl is set to true')