openstack
/
puppet-cinder
Code Issues Proposed changes

Change default value of backup_swift_container to match tht 

The warning message stated this was to happen in OSP-N.

Change-Id: Iedc9d703d49eeabffa50de49a1d33e2fc4c6e77a
This commit is contained in:
Keith Schincke 2018-01-09 23:54:28 -05:00
parent f6fe6a0442
commit deae719adf
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/backup/swift.pp
View File

@ -19,7 +19,7 @@
#
# [*backup_swift_container*]
# (optional) The default Swift container to use.
# Defaults to 'volumes_backup'
# Defaults to 'volumebackups'
#
# [*backup_swift_object_size*]
# (optional) The size in bytes of Swift backup objects.
@ -78,7 +78,7 @@ class cinder::backup::swift (
$backup_driver = 'cinder.backup.drivers.swift',
$backup_swift_url = $::os_service_default,
$backup_swift_auth_url = $::os_service_default,
$backup_swift_container = 'volumes_backup',
$backup_swift_container = 'volumebackups',
$backup_swift_object_size = $::os_service_default,
$backup_swift_retry_attempts = $::os_service_default,
$backup_swift_retry_backoff = $::os_service_default,
@ -90,11 +90,6 @@ class cinder::backup::swift (
include ::cinder::deps
if ($backup_swift_container == 'volumes_backup') {
warning("The OpenStack default value of backup_swift_container differs from the puppet module \
default of \"volumes_backup\" and will be changed to the upstream OpenStack default in N-release.")
}
cinder_config {
'DEFAULT/backup_driver': value => $backup_driver;
'DEFAULT/backup_swift_url': value => $backup_swift_url;

5
releasenotes/notes/change-backup-swift-container-4fa57507543fdda3.yaml Normal file
View File

@ -0,0 +1,5 @@
---
other:
- |
Changed the default value of cinder::backup::swift::backup_swift_container
to volumebackups. This matches the default from tht and removes a warning.

2
spec/classes/cinder_backup_swift_spec.rb
View File

@ -25,7 +25,7 @@ describe 'cinder::backup::swift' do
let :default_params do
{ :backup_swift_url => '<SERVICE DEFAULT>',
:backup_swift_auth_url => '<SERVICE DEFAULT>',
:backup_swift_container => 'volumes_backup',
:backup_swift_container => 'volumebackups',
:backup_swift_object_size => '<SERVICE DEFAULT>',
:backup_swift_retry_attempts => '<SERVICE DEFAULT>',
:backup_swift_retry_backoff => '<SERVICE DEFAULT>',