Browse Source

Merge "Remove the usage of cinder::ceilometer"

tags/12.3.0
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
64fdc5cda9
4 changed files with 2 additions and 18 deletions
  1. +0
    -2
      manifests/profile/base/cinder.pp
  2. +0
    -1
      manifests/profile/base/cinder/api.pp
  3. +0
    -5
      spec/classes/tripleo_profile_base_cinder_api_spec.rb
  4. +2
    -10
      spec/classes/tripleo_profile_base_cinder_spec.rb

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

@@ -113,8 +113,6 @@ class tripleo::profile::base::cinder (
'password' => $oslomsg_rpc_password,
'ssl' => $oslomsg_rpc_use_ssl_real,
}),
}
class { 'cinder::ceilometer' :
notification_transport_url => os_transport_url({
'transport' => $oslomsg_notify_proto,
'hosts' => $oslomsg_notify_hosts,


+ 0
- 1
manifests/profile/base/cinder/api.pp View File

@@ -106,7 +106,6 @@ class tripleo::profile::base::cinder::api (
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
}
include cinder::ceilometer
}

if $step == 4 and $manage_type and $default_volume_type != '' {


+ 0
- 5
spec/classes/tripleo_profile_base_cinder_api_spec.rb View File

@@ -35,7 +35,6 @@ describe 'tripleo::profile::base::cinder::api' do
is_expected.to contain_class('tripleo::profile::base::cinder::authtoken')
is_expected.to_not contain_class('cinder::api')
is_expected.to_not contain_class('tripleo::profile::base::apache')
is_expected.to_not contain_class('cinder::ceilometer')
end
end

@@ -55,7 +54,6 @@ describe 'tripleo::profile::base::cinder::api' do
:keymgr_backend => 'cinder.keymgr.conf_key_mgr.ConfKeyManager',
)
is_expected.to contain_class('tripleo::profile::base::apache')
is_expected.to contain_class('cinder::ceilometer')
end
end

@@ -71,7 +69,6 @@ describe 'tripleo::profile::base::cinder::api' do
is_expected.to contain_class('tripleo::profile::base::cinder::authtoken')
is_expected.to_not contain_class('cinder::api')
is_expected.to_not contain_class('tripleo::profile::base::apache')
is_expected.to_not contain_class('cinder::ceilometer')
end
end

@@ -90,7 +87,6 @@ describe 'tripleo::profile::base::cinder::api' do
:keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
)
is_expected.to contain_class('tripleo::profile::base::apache')
is_expected.to contain_class('cinder::ceilometer')
is_expected.to contain_cinder__type('tripleo')
end
end
@@ -110,7 +106,6 @@ describe 'tripleo::profile::base::cinder::api' do
:keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
)
is_expected.to contain_class('tripleo::profile::base::apache')
is_expected.to contain_class('cinder::ceilometer')
is_expected.to_not contain_cinder__type('tripleo')
end
end


+ 2
- 10
spec/classes/tripleo_profile_base_cinder_spec.rb View File

@@ -23,7 +23,6 @@ describe 'tripleo::profile::base::cinder' do
it 'should do nothing' do
is_expected.to contain_class('tripleo::profile::base::cinder')
is_expected.to_not contain_class('cinder')
is_expected.to_not contain_class('cinder::ceilometer')
is_expected.to_not contain_class('cinder::config')
is_expected.to_not contain_class('cinder::glance')
is_expected.to_not contain_class('cinder::nova')
@@ -49,9 +48,7 @@ describe 'tripleo::profile::base::cinder' do

it 'should trigger complete configuration' do
is_expected.to contain_class('cinder').with(
:default_transport_url => 'rabbit://cinder1:foo@192.168.0.1:1234/?ssl=0'
)
is_expected.to contain_class('cinder::ceilometer').with(
:default_transport_url => 'rabbit://cinder1:foo@192.168.0.1:1234/?ssl=0',
:notification_transport_url => 'rabbit://cinder2:baa@192.168.0.2:5678/?ssl=0'
)
is_expected.to contain_class('cinder::config')
@@ -71,7 +68,6 @@ describe 'tripleo::profile::base::cinder' do

it 'should not trigger any configuration' do
is_expected.to_not contain_class('cinder')
is_expected.to_not contain_class('cinder::ceilometer')
is_expected.to_not contain_class('cinder::config')
is_expected.to_not contain_class('cinder::glance')
is_expected.to_not contain_class('cinder::nova')
@@ -97,9 +93,7 @@ describe 'tripleo::profile::base::cinder' do

it 'should trigger cinder configuration without mysql grant' do
is_expected.to contain_class('cinder').with(
:default_transport_url => 'rabbit://cinder1:foo@192.168.0.1:1234/?ssl=0'
)
is_expected.to contain_class('cinder::ceilometer').with(
:default_transport_url => 'rabbit://cinder1:foo@192.168.0.1:1234/?ssl=0',
:notification_transport_url => 'rabbit://cinder2:baa@192.168.0.2:5678/?ssl=0'
)
is_expected.to contain_class('cinder::config')
@@ -124,7 +118,6 @@ describe 'tripleo::profile::base::cinder' do
is_expected.to contain_class('cinder').with(
:default_transport_url => 'rabbit://cinder:foo@127.0.0.1:5672/?ssl=0'
)
is_expected.to contain_class('cinder::ceilometer')
is_expected.to contain_class('cinder::config')
is_expected.to contain_class('cinder::glance')
is_expected.to contain_class('cinder::nova')
@@ -148,7 +141,6 @@ describe 'tripleo::profile::base::cinder' do
is_expected.to contain_class('cinder').with(
:default_transport_url => 'rabbit://cinder:foo@127.0.0.1:5672/?ssl=0'
)
is_expected.to contain_class('cinder::ceilometer')
is_expected.to contain_class('cinder::config')
is_expected.to contain_class('cinder::glance')
is_expected.to contain_class('cinder::nova')


Loading…
Cancel
Save