stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Drop old deprecations

Browse Source 
This module has been used for a while, it's time to drop deprecations.

* drop cloud::compute::controller, replaced by cloud::compute::{api,scheduler,...}
* drop cloud::image, replaced by cloud::image::{api,registry}
* drop cloud::telemetry::server, replaced by cloud::telemetry::{api,alarm,...}
* hypervisor: delete has_ceph parameter
* hypervisor: drop backward compatibility for spice params
* loadbalancer: drop two old parameters for keepalived
* loadbalancer: drop useless comments
* volume: delete cloud::volume::controller (replaced by api,scheduler)
* volume: only keep multi-backend support

Change-Id: I7376fe0f3bfa3eb00589eb3b7a4532236765e560
This commit is contained in:
Emilien Macchi
2014-11-27 16:47:58 -05:00
parent 3846a044a3
commit 8e523680c9
19 changed files with 157 additions and 1094 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
spec/classes/cloud_compute_hypervisor_spec.rb
View File

@@ -68,7 +68,6 @@ describe 'cloud::compute::hypervisor' do
{ :libvirt_type => 'kvm',
:server_proxyclient_address => '7.0.0.1',
:spice_port => '6082',
:has_ceph => false,
:nova_ssh_private_key => 'secrete',
:nova_ssh_public_key => 'public',
:ks_nova_public_proto => 'http',
@@ -388,39 +387,6 @@ describe 'cloud::compute::hypervisor' do
end
end
context 'with RBD backend plaforms using deprecated parameter' do
before :each do
facts.merge!( :vtx => true )
params.merge!(
:has_ceph => true,
:cinder_rbd_user => 'cinder',
:nova_rbd_pool => 'nova',
:nova_rbd_secret_uuid => 'secrete' )
end
it 'configure nova-compute to support RBD backend' do
is_expected.to contain_nova_config('libvirt/images_type').with('value' => 'rbd')
is_expected.to contain_nova_config('libvirt/images_rbd_pool').with('value' => 'nova')
is_expected.to contain_nova_config('libvirt/images_rbd_ceph_conf').with('value' => '/etc/ceph/ceph.conf')
is_expected.to contain_nova_config('libvirt/rbd_user').with('value' => 'cinder')
is_expected.to contain_nova_config('libvirt/rbd_secret_uuid').with('value' => 'secrete')
is_expected.to contain_group('cephkeyring').with(:ensure => 'present')
is_expected.to contain_exec('add-nova-to-group').with(
:command => 'usermod -a -G cephkeyring nova',
:unless => 'groups nova | grep cephkeyring'
)
end
it 'configure libvirt driver' do
is_expected.to contain_class('nova::compute::libvirt').with(
:libvirt_type => 'kvm',
:vncserver_listen => '0.0.0.0',
:migration_support => true,
:libvirt_disk_cachemodes => ['network=writeback']
)
end
end
context 'when trying to enable RBD backend on RedHat OSP < 7 plaforms' do
before :each do
facts.merge!( :osfamily => 'RedHat',
@@ -441,36 +407,6 @@ describe 'cloud::compute::hypervisor' do
it_raises 'a Puppet::Error', /libvirt_type is set to KVM and VTX seems to be disabled on this node./
end
context 'when trying to enable RBD backend with deprecated parameter on RedHat plaforms' do
before :each do
facts.merge!( :osfamily => 'RedHat',
:operatingsystemmajrelease => '6' )
params.merge!(
:has_ceph => true,
:cinder_rbd_user => 'cinder',
:nova_rbd_pool => 'nova',
:nova_rbd_secret_uuid => 'secrete' )
end
it_raises 'a Puppet::Error', /RBD image backend in Nova is not supported in RHEL 6./
end
context 'when configuring spice with backward compatibility' do
before :each do
params.merge!(
:ks_spice_public_proto => false,
:ks_spice_public_host => false )
end
it 'configure spice console with nova parameters' do
is_expected.to contain_class('nova::compute::spice').with(
:server_listen => '0.0.0.0',
:server_proxyclient_address => '7.0.0.1',
:proxy_host => '10.0.0.1',
:proxy_protocol => 'http',
:proxy_port => '6082'
)
end
end
context 'when storing instances on a NFS share' do
before :each do
params.merge!(