diff --git a/manifests/api.pp b/manifests/api.pp index e261d864..b944ccfe 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -154,9 +154,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. @@ -229,7 +226,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', @@ -241,10 +237,6 @@ class glance::api( include ::glance::api::logging 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-api', { diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index f0b2090a..59170a4d 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -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': diff --git a/manifests/registry.pp b/manifests/registry.pp index 812244a9..220ee1ab 100644 --- a/manifests/registry.pp +++ b/manifests/registry.pp @@ -128,9 +128,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', @@ -160,7 +157,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, @@ -170,10 +166,6 @@ class glance::registry( include ::glance::registry::logging 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-registry', {