openstack
/
puppet-glance
Code Issues Proposed changes

Remove deprecated mysql_module 

This has been deprecated for some time and should be removed.

Change-Id: I648b6415385bc32ddeb2ae916e0cdb5c40c05743
This commit is contained in:
Matt Fischer 2015-10-12 19:50:39 -06:00
parent 646a6cd15f
commit 26cbd53d99
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/api.pp
View File

@ -150,9 +150,6 @@
# (optional) CA certificate file to use to verify connecting clients
# Defaults to false, not set
#
# [*mysql_module*]
# (optional) Deprecated. Does nothing.
#
# [*known_stores*]
# (optional)List of which store classes and store class locations are
# currently known to glance at startup.
@ -224,7 +221,6 @@ class glance::api(
$validate = false,
$validation_options = {},
# DEPRECATED PARAMETERS
$mysql_module = undef,
$auth_host = '127.0.0.1',
$auth_url = 'http://localhost:5000/v2.0',
$auth_port = '35357',
@ -235,10 +231,6 @@ class glance::api(
include ::glance::policy
require keystone::python
if $mysql_module {
warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
}
if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
ensure_packages([$glance::params::api_package_name],
{

8
manifests/db/mysql.pp
View File

@ -26,9 +26,6 @@
# [*collate*]
# the database collation. Optional. Defaults to 'utf8_general_ci'
#
# [*mysql_module*]
# (optional) Deprecated. Does nothing.
#
# === Deprecated parameters:
#
# [*cluster_id*] This parameter does nothing
@ -42,13 +39,8 @@ class glance::db::mysql(
$charset = 'utf8',
$collate = 'utf8_general_ci',
$cluster_id = 'localzone',
$mysql_module = 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 { 'glance':

8
manifests/registry.pp
View File

@ -119,9 +119,6 @@
# (Optional) Run db sync on the node.
# Defaults to true
#
# [*mysql_module*]
# (optional) Deprecated. Does nothing.
#
class glance::registry(
$keystone_password,
$package_ensure = 'present',
@ -149,7 +146,6 @@ class glance::registry(
$ca_file = false,
$sync_db = true,
# DEPRECATED PARAMETERS
$mysql_module = undef,
$auth_host = '127.0.0.1',
$auth_port = '35357',
$auth_admin_prefix = false,
@ -158,10 +154,6 @@ class glance::registry(
require keystone::python
if $mysql_module {
warning('The mysql_module parameter is deprecated. The latest 2.x mysql module will be used.')
}
if ( $glance::params::api_package_name != $glance::params::registry_package_name ) {
ensure_packages( [$glance::params::registry_package_name],
{