Remove deprecated sync_db options

The sync_db option has been deprecated in Ocata[1].
we can remove it.

[1]https://review.openstack.org/#/c/408161/

Change-Id: I35898b6c298c864a76e05b41322fc61d75244c0d
This commit is contained in:
ZhongShengping 2018-02-08 15:45:43 +08:00
parent 2268c0544e
commit 1f7a5323fe
3 changed files with 3 additions and 15 deletions

View File

@ -121,12 +121,6 @@
# should be set to False.
# Defaults to false.
#
# DEPRECATED PARAMETERS
#
# [*sync_db*]
# (Optional) Run db sync on the node.
# Defaults to undef
#
class glance::registry(
$package_ensure = 'present',
$debug = undef,
@ -155,8 +149,6 @@ class glance::registry(
$ca_file = $::os_service_default,
$os_region_name = $::os_service_default,
$enable_v1_registry = false,
# DEPRECATED
$sync_db = undef,
) inherits glance {
include ::glance::deps
@ -208,11 +200,6 @@ class glance::registry(
'DEFAULT/ca_file': value => $ca_file;
}
if $sync_db {
warning('sync_db is deprecated in glance::registry. This option will be removed in a future release. Please use glance::api::sync_db.')
include ::glance::db::sync
}
if $manage_service {
if $enabled {
$service_ensure = 'running'

View File

@ -0,0 +1,3 @@
---
other:
- Remove deprecated glance::registry::sync_db option.

View File

@ -19,7 +19,6 @@ describe 'glance::registry' do
:enabled => true,
:manage_service => true,
:purge_config => false,
:sync_db => true,
:os_region_name => '<SERVICE DEFAULT>',
:ca_file => '<SERVICE DEFAULT>',
:cert_file => '<SERVICE DEFAULT>',
@ -35,7 +34,6 @@ describe 'glance::registry' do
:bind_port => '9111',
:workers => '5',
:enabled => false,
:sync_db => false,
:os_region_name => 'RegionOne2',
}
].each do |param_set|