openstack/puppet-cinder
Code Issues Proposed changes

Merge "Remove support for VMWare storage driver"

Browse Source
This commit is contained in:
Zuul 2024-10-07 16:01:17 +00:00 committed by Gerrit Code Review
commit 2cbff6f231
5 changed files with 4 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
manifests/backend/vmdk.pp
View File

@ -1,118 +0,0 @@
# == define: cinder::backend::vmdk
#
# DEPRECATED !!
# Configure the VMware VMDK driver for cinder.
#
# === Parameters
#
# [*host_ip*]
# The IP address of the VMware vCenter server.
#
# [*host_username*]
# The username for connection to VMware vCenter server.
#
# [*host_password*]
# The password for connection to VMware vCenter server.
#
# [*volume_backend_name*]
# Used to set the volume_backend_name in multiple backends.
# Defaults to $name as passed in the title.
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this volume backend.
# If not set, the storage_availability_zone option value
# is used as the default for all backends.
# Defaults to $facts['os_service_default'].
#
# [*api_retry_count*]
# (optional) The number of times we retry on failures,
# e.g., socket error, etc.
# Defaults to $facts['os_service_default'].
#
# [*volume_folder*]
# (optional) The name for the folder in the VC datacenter that will contain
# cinder volumes.
# Defaults to $facts['os_service_default'].
#
# [*max_object_retrieval*]
# (optional) The maximum number of ObjectContent data objects that should
# be returned in a single result. A positive value will cause
# the operation to suspend the retrieval when the count of
# objects reaches the specified maximum. The server may still
# limit the count to something less than the configured value.
# Any remaining objects may be retrieved with additional requests.
# Defaults to $facts['os_service_default']
#
# [*task_poll_interval*]
# (optional) The interval in seconds used for polling of remote tasks.
# Defaults to $facts['os_service_default'].
#
# [*image_transfer_timeout_secs*]
# (optional) The timeout in seconds for VMDK volume transfer between Cinder
# and Glance.
# Defaults to $facts['os_service_default']
#
# [*wsdl_location*]
# (optional) VIM Service WSDL Location e.g
# http://<server>/vimService.wsdl. Optional over-ride to
# default location for bug work-arounds.
# Defaults to $facts['os_service_default'].
#
# [*manage_volume_type*]
# (Optional) Whether or not manage Cinder Volume type.
# If set to true, a Cinder Volume type will be created
# with volume_backend_name=$volume_backend_name key/value.
# Defaults to false.
#
# [*extra_options*]
# (optional) Hash of extra options to pass to the backend stanza
# Defaults to: {}
# Example :
# { 'vmdk_backend/param1' => { 'value' => value1 } }
#
define cinder::backend::vmdk (
$host_ip,
$host_username,
$host_password,
$volume_backend_name = $name,
$backend_availability_zone = $facts['os_service_default'],
$volume_folder = $facts['os_service_default'],
$api_retry_count = $facts['os_service_default'],
$max_object_retrieval = $facts['os_service_default'],
$task_poll_interval = $facts['os_service_default'],
$image_transfer_timeout_secs = $facts['os_service_default'],
$wsdl_location = $facts['os_service_default'],
Boolean $manage_volume_type = false,
Hash $extra_options = {},
) {
include cinder::deps
warning('Support for VMWare storage driver has been deprecated')
cinder_config {
"${name}/volume_backend_name": value => $volume_backend_name;
"${name}/backend_availability_zone": value => $backend_availability_zone;
"${name}/volume_driver": value => 'cinder.volume.drivers.vmware.vmdk.VMwareVcVmdkDriver';
"${name}/vmware_host_ip": value => $host_ip;
"${name}/vmware_host_username": value => $host_username;
"${name}/vmware_host_password": value => $host_password, secret => true;
"${name}/vmware_volume_folder": value => $volume_folder;
"${name}/vmware_api_retry_count": value => $api_retry_count;
"${name}/vmware_max_object_retrieval": value => $max_object_retrieval;
"${name}/vmware_task_poll_interval": value => $task_poll_interval;
"${name}/vmware_image_transfer_timeout_secs": value => $image_transfer_timeout_secs;
"${name}/vmware_wsdl_location": value => $wsdl_location;
"${name}/host": value => "vmdk:${host_ip}-${volume_folder}";
}
if $manage_volume_type {
cinder_type { $volume_backend_name:
ensure => present,
properties => ["volume_backend_name=${volume_backend_name}"],
}
}
create_resources('cinder_config', $extra_options)
}

36
manifests/vmware.pp
View File

@ -1,36 +0,0 @@
# == Class: cinder::vmware
#
# DEPRECATED !!
# Creates vmdk specific disk file type & clone type.
#
class cinder::vmware {
include cinder::deps
warning('Support for VMWare storage driver has been deprecated')
cinder_type { 'vmware-thin':
ensure => present,
properties => ['vmware:vmdk_type=thin']
}
cinder_type { 'vmware-thick':
ensure => present,
properties => ['vmware:vmdk_type=thick']
}
cinder_type { 'vmware-eagerZeroedThick':
ensure => present,
properties => ['vmware:vmdk_type=eagerZeroedThick']
}
cinder_type { 'vmware-full':
ensure => present,
properties => ['vmware:clone_type=full']
}
cinder_type { 'vmware-linked':
ensure => present,
properties => ['vmware:clone_type=linked']
}
}

4
releasenotes/notes/remove-vmware-925ec2a7fae94f77.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
Support for VMWare storage driver has been removed.

44
spec/classes/cinder_vmware_spec.rb
View File

@ -1,44 +0,0 @@
require 'spec_helper'
describe 'cinder::vmware' do
shared_examples 'cinder::vmware' do
context 'with defaults' do
it { is_expected.to contain_cinder_type('vmware-thin').with(
:ensure => :present,
:properties => ['vmware:vmdk_type=thin']
)}
it { is_expected.to contain_cinder_type('vmware-thick').with(
:ensure => :present,
:properties => ['vmware:vmdk_type=thick']
)}
it { is_expected.to contain_cinder_type('vmware-eagerZeroedThick').with(
:ensure => :present,
:properties => ['vmware:vmdk_type=eagerZeroedThick']
)}
it { is_expected.to contain_cinder_type('vmware-full').with(
:ensure => :present,
:properties => ['vmware:clone_type=full']
)}
it { is_expected.to contain_cinder_type('vmware-linked').with(
:ensure => :present,
:properties => ['vmware:clone_type=linked']
)}
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())
end
it_behaves_like 'cinder::vmware'
end
end
end

91
spec/defines/cinder_backend_vmdk_spec.rb
View File

@ -1,91 +0,0 @@
require 'spec_helper'
describe 'cinder::backend::vmdk' do
let(:title) { 'hippo' }
let :params do
{
:host_ip => '172.16.16.16',
:host_password => 'asdf',
:host_username => 'user',
}
end
let :optional_params do
{
:volume_folder => 'cinder-volume-folder',
:api_retry_count => 5,
:max_object_retrieval => 200,
:task_poll_interval => 10,
:image_transfer_timeout_secs => 3600,
:backend_availability_zone => 'my_zone',
:wsdl_location => 'http://127.0.0.1:8080/vmware/SDK/wsdl/vim25/vimService.wsdl'
}
end
shared_examples 'cinder::backend::vmdk' do
it {
is_expected.to contain_cinder_config('hippo/volume_backend_name').with_value('hippo')
is_expected.to contain_cinder_config('hippo/volume_driver').with_value('cinder.volume.drivers.vmware.vmdk.VMwareVcVmdkDriver')
is_expected.to contain_cinder_config('hippo/vmware_host_ip').with_value(params[:host_ip])
is_expected.to contain_cinder_config('hippo/vmware_host_username').with_value(params[:host_username])
is_expected.to contain_cinder_config('hippo/vmware_host_password').with_value(params[:host_password]).with_secret(true)
is_expected.to contain_cinder_config('hippo/vmware_volume_folder').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('hippo/vmware_api_retry_count').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('hippo/vmware_max_object_retrieval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('hippo/vmware_task_poll_interval').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('hippo/vmware_image_transfer_timeout_secs').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('hippo/vmware_wsdl_location').with_value('<SERVICE DEFAULT>')
is_expected.to contain_cinder_config('hippo/backend_availability_zone').with_value('<SERVICE DEFAULT>')
}
context 'with optional parameters' do
before :each do
params.merge!(optional_params)
end
it {
is_expected.to contain_cinder_config('hippo/backend_availability_zone').with_value(params[:backend_availability_zone])
is_expected.to contain_cinder_config('hippo/vmware_volume_folder').with_value(params[:volume_folder])
is_expected.to contain_cinder_config('hippo/vmware_api_retry_count').with_value(params[:api_retry_count])
is_expected.to contain_cinder_config('hippo/vmware_max_object_retrieval').with_value(params[:max_object_retrieval])
is_expected.to contain_cinder_config('hippo/vmware_task_poll_interval').with_value(params[:task_poll_interval])
is_expected.to contain_cinder_config('hippo/vmware_image_transfer_timeout_secs').with_value(params[:image_transfer_timeout_secs])
is_expected.to contain_cinder_config('hippo/vmware_wsdl_location').with_value(params[:wsdl_location])
is_expected.to contain_cinder_config('hippo/backend_availability_zone').with_value(params[:backend_availability_zone])
is_expected.to contain_cinder_config('hippo/host').with_value("vmdk:#{params[:host_ip]}-#{params[:volume_folder]}")
}
end
context 'vmdk backend with additional configuration' do
before do
params.merge!( :extra_options => {'hippo/param1' => { 'value' => 'value1' }} )
end
it { is_expected.to contain_cinder_config('hippo/param1').with_value('value1') }
end
context 'vmdk backend with cinder type' do
before do
params.merge!( :manage_volume_type => true )
end
it { is_expected.to contain_cinder_type('hippo').with(
:ensure => 'present',
:properties => ['volume_backend_name=hippo']
)}
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())
end
it_behaves_like 'cinder::backend::vmdk'
end
end
end