openstack/puppet-manila
Code Issues Proposed changes

Merge "Remove manila::backend::cephfsnative"

Browse Source
This commit is contained in:
Zuul 2018-06-18 19:13:45 +00:00 committed by Gerrit Code Review
commit aeab949d0a
3 changed files with 4 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
manifests/backend/cephfsnative.pp
View File

@ -1,56 +0,0 @@
# ==define manila::backend::cephfsnative
#
# === Parameters
#
# [*driver_handles_share_servers*]
# (optional) Denotes whether the driver should handle the responsibility of
# managing share servers. This must be set to false if the driver is to
# operate without managing share servers.
# Defaults to: False
#
# [*share_backend_name*]
# (optional) Name of the backend in manila.conf that
# these settings will reside in
# Defaults to: cephfsnative
#
# [*cephfs_conf_path*]
# (optional) Path to cephfs config.
# Defaults to: $state_path/ceph.conf
#
# [*cephfs_auth_id*]
# (optional) cephx user id for Manila
# Defaults to: manila
#
# [*cephfs_cluster_name*]
# (optional) Name of the cephfs cluster the driver will connect to.
# Defaults to: ceph
#
# [*cephfs_enable_snapshots*]
# (optional) If set to True, then Manila will utilize ceph snapshots.
# Defaults to: True
#
define manila::backend::cephfsnative (
$driver_handles_share_servers = false,
$share_backend_name = $name,
$cephfs_conf_path = '$state_path/ceph.conf',
$cephfs_auth_id = 'manila',
$cephfs_cluster_name = 'ceph',
$cephfs_enable_snapshots = true,
) {
include ::manila::deps
warning('manila::cephfsnative class is deprecated and will be removed in next release. You can use cephfs backend.')
$share_driver = 'manila.share.drivers.cephfs.cephfs_native.CephFSNativeDriver'
manila_config {
"${name}/driver_handles_share_servers": value => $driver_handles_share_servers;
"${name}/share_backend_name": value => $share_backend_name;
"${name}/share_driver": value => $share_driver;
"${name}/cephfs_conf_path": value => $cephfs_conf_path;
"${name}/cephfs_auth_id": value => $cephfs_auth_id;
"${name}/cephfs_cluster_name": value => $cephfs_cluster_name;
"${name}/cephfs_enable_snapshots": value => $cephfs_enable_snapshots;
}
}

4
releasenotes/notes/remove-cephfsnative-fd796d36cc8ebb38.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- The class manila::backend::cephfsnative has been removed, class
manila::backend::cephfscephfs can be used instead.

47
spec/defines/manila_backend_cephfsnative_spec.rb
View File

@ -1,47 +0,0 @@
require 'spec_helper'
describe 'manila::backend::cephfsnative' do
shared_examples_for 'cephfsnative driver' do
let(:title) {'cephfsnative'}
let :params do
{
:driver_handles_share_servers => false,
:share_backend_name => 'cephfs',
:cephfs_conf_path => '$state_path/ceph.conf',
:cephfs_auth_id => 'manila',
:cephfs_cluster_name => 'ceph',
:cephfs_enable_snapshots => true,
}
end
it 'configures cephfsnative driver' do
is_expected.to contain_manila_config('cephfsnative/share_driver').with_value(
'manila.share.drivers.cephfs.cephfs_native.CephFSNativeDriver')
is_expected.to contain_manila_config('cephfsnative/share_backend_name').with_value(
'cephfs')
is_expected.to contain_manila_config('cephfsnative/cephfs_conf_path').with_value(
'$state_path/ceph.conf')
is_expected.to contain_manila_config('cephfsnative/cephfs_auth_id').with_value(
'manila')
is_expected.to contain_manila_config('cephfsnative/cephfs_cluster_name').with_value(
'ceph')
is_expected.to contain_manila_config('cephfsnative/cephfs_enable_snapshots').with_value(
true)
end
end
on_supported_os({
:supported_os => OSDefaults.get_supported_os
}).each do |os,facts|
context "on #{os}" do
let (:facts) do
facts.merge(OSDefaults.get_facts({ :osfamily => "#{os}" }))
end
it_configures 'cephfsnative driver'
end
end
end