Browse Source

Merge "cinder: remove support for the Veritas HyperScale Driver"

changes/26/749026/4
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
cddca4de5e
6 changed files with 1 additions and 144 deletions
  1. +0
    -13
      manifests/profile/base/cinder/volume.pp
  2. +0
    -45
      manifests/profile/base/cinder/volume/veritas_hyperscale.pp
  3. +0
    -3
      manifests/profile/base/database/mysql.pp
  4. +0
    -3
      manifests/profile/base/rabbitmq.pp
  5. +0
    -57
      spec/classes/tripleo_profile_base_cinder_veritas_hyperscale_spec.rb
  6. +1
    -23
      spec/classes/tripleo_profile_base_cinder_volume_spec.rb

+ 0
- 13
manifests/profile/base/cinder/volume.pp View File

@ -86,10 +86,6 @@
# (Optional) Whether to enable the scaleio backend
# Defaults to false
#
#[*cinder_enable_vrts_hs_backend*]
# (Optional) Whether to enable the Veritas HyperScale backend
# Defaults to false
#
#[*cinder_enable_nvmeof_backend*]
# (Optional) Whether to enable the NVMeOF backend
# Defaults to false
@ -155,7 +151,6 @@ class tripleo::profile::base::cinder::volume (
$cinder_enable_nfs_backend = false,
$cinder_enable_rbd_backend = false,
$cinder_enable_scaleio_backend = false,
$cinder_enable_vrts_hs_backend = false,
$cinder_enable_nvmeof_backend = false,
$cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef),
$cinder_volume_cluster = '',
@ -349,13 +344,6 @@ class tripleo::profile::base::cinder::volume (
$cinder_scaleio_backend_name = undef
}
if $cinder_enable_vrts_hs_backend {
include tripleo::profile::base::cinder::volume::veritas_hyperscale
$cinder_veritas_hyperscale_backend_name = 'Veritas_HyperScale'
} else {
$cinder_veritas_hyperscale_backend_name = undef
}
if $cinder_enable_nvmeof_backend {
include tripleo::profile::base::cinder::volume::nvmeof
$cinder_nvmeof_backend_name = hiera('cinder::backend::nvmeof::volume_backend_name', 'tripleo_nvmeof')
@ -381,7 +369,6 @@ class tripleo::profile::base::cinder::volume (
$cinder_netapp_backend_name,
$cinder_nfs_backend_name,
$cinder_scaleio_backend_name,
$cinder_veritas_hyperscale_backend_name,
$cinder_user_enabled_backends,
$cinder_nvmeof_backend_name))
# NOTE(aschultz): during testing it was found that puppet 3 may incorrectly


+ 0
- 45
manifests/profile/base/cinder/volume/veritas_hyperscale.pp View File

@ -1,45 +0,0 @@
# Copyright (c) 2017 Veritas Technologies LLC.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# == Class: tripleo::profile::base::cinder::volume::veritas_hyperscale
#
# Cinder Volume Veritas HyperScale profile for tripleo
#
# === Parameters
#
# [*backend_name*]
# (Optional) The name of Veritas HyperScale cinder backend.
# Currently the backend name is hard-coded in the driver, and it won't
# function if other value is set in hiera.
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::cinder::volume::veritas_hyperscale (
# Note: Currently the backend name is hard-coded in the driver, and it won't
# function if other value is set in hiera.
$backend_name = hiera('cinder::backend::veritas_hyperscale::volume_backend_name', 'Veritas_HyperScale'),
$step = Integer(hiera('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
cinder::backend::veritas_hyperscale { $backend_name :
backend_availability_zone => hiera('cinder::backend::veritas_hyperscale::backend_availability_zone', undef)
}
}
}

+ 0
- 3
manifests/profile/base/database/mysql.pp View File

@ -299,9 +299,6 @@ class tripleo::profile::base::database::mysql (
# NOTE: by default zaqar uses sqlalchemy
tripleo::profile::base::database::mysql::include_and_check_auth{'zaqar::db::mysql':}
}
if hiera('veritas_hyperscale_controller_enabled', false) {
tripleo::profile::base::database::mysql::include_and_check_auth{'veritas_hyperscale::db::mysql':}
}
}
}

+ 0
- 3
manifests/profile/base/rabbitmq.pp View File

@ -267,9 +267,6 @@ class tripleo::profile::base::rabbitmq (
admin => true,
}
}
if hiera('veritas_hyperscale_controller_enabled', false) {
include veritas_hyperscale::hs_rabbitmq
}
}
}

+ 0
- 57
spec/classes/tripleo_profile_base_cinder_veritas_hyperscale_spec.rb View File

@ -1,57 +0,0 @@
#
# Copyright (c) 2017 Veritas Technologies LLC.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
require 'spec_helper'
describe 'tripleo::profile::base::cinder::volume::veritas_hyperscale' do
shared_examples_for 'tripleo::profile::base::cinder::volume::veritas_hyperscale' do
before :each do
facts.merge!({ :step => params[:step] })
end
context 'with step less than 4' do
let(:params) { { :step => 3 } }
it 'should do nothing' do
is_expected.to contain_class('tripleo::profile::base::cinder::volume::veritas_hyperscale')
is_expected.to contain_class('tripleo::profile::base::cinder::volume')
is_expected.to contain_class('tripleo::profile::base::cinder')
is_expected.to_not contain_cinder__backend__veritas_hyperscale('Veritas_HyperScale')
end
end
context 'with step 4' do
let(:params) { {
:step => 4,
} }
it 'should trigger complete configuration' do
is_expected.to contain_cinder__backend__veritas_hyperscale('Veritas_HyperScale')
end
end
end
on_supported_os.each do |os, facts|
context "on #{os}" do
let(:facts) do
facts.merge({ :hostname => 'node.example.com' })
end
it_behaves_like 'tripleo::profile::base::cinder::volume::veritas_hyperscale'
end
end
end

+ 1
- 23
spec/classes/tripleo_profile_base_cinder_volume_spec.rb View File

@ -288,25 +288,6 @@ describe 'tripleo::profile::base::cinder::volume' do
)
end
end
end
context 'with only veritas hyperscale' do
before :each do
params.merge!({
:cinder_enable_vrts_hs_backend => true,
:cinder_enable_iscsi_backend => false,
})
end
it 'should configure only veritas hyperscale' do
is_expected.to contain_class('tripleo::profile::base::cinder::volume::veritas_hyperscale')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::iscsi')
is_expected.to contain_class('tripleo::profile::base::cinder::volume')
is_expected.to contain_class('tripleo::profile::base::cinder')
is_expected.to contain_class('cinder::volume')
is_expected.to contain_class('cinder::backends').with(
:enabled_backends => ['Veritas_HyperScale']
)
end
end
context 'with only nfs' do
@ -376,7 +357,6 @@ describe 'tripleo::profile::base::cinder::volume' do
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellemc_powerstore')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::dellemc_vxflexos')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::netapp')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::veritas_hyperscale')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::nfs')
is_expected.to_not contain_class('tripleo::profile::base::cinder::volume::rbd')
is_expected.to contain_class('tripleo::profile::base::cinder::volume')
@ -403,7 +383,6 @@ describe 'tripleo::profile::base::cinder::volume' do
:cinder_enable_dellemc_xtremio_backend => true,
:cinder_enable_dellemc_vxflexos_backend => true,
:cinder_enable_netapp_backend => true,
:cinder_enable_vrts_hs_backend => true,
})
end
it 'should configure all backends' do
@ -417,7 +396,6 @@ describe 'tripleo::profile::base::cinder::volume' do
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_powerstore')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::dellemc_vxflexos')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::netapp')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::veritas_hyperscale')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::nfs')
is_expected.to contain_class('tripleo::profile::base::cinder::volume::rbd')
is_expected.to contain_class('tripleo::profile::base::cinder::volume')
@ -426,7 +404,7 @@ describe 'tripleo::profile::base::cinder::volume' do
is_expected.to contain_class('cinder::backends').with(
:enabled_backends => ['tripleo_iscsi', 'tripleo_ceph', 'tripleo_pure', 'tripleo_dellsc', 'tripleo_dellemc_sc','tripleo_dellemc_powerflex',
'tripleo_dellemc_powermax', 'tripleo_dellemc_powerstore','tripleo_dellemc_vxflexos', 'tripleo_dellemc_xtremio',
'tripleo_netapp','tripleo_nfs','Veritas_HyperScale']
'tripleo_netapp','tripleo_nfs']
)
end
end


Loading…
Cancel
Save