Merge "Remove the usage of cinder::ceilometer"
This commit is contained in:
commit
64fdc5cda9
|
@ -113,8 +113,6 @@ class tripleo::profile::base::cinder (
|
||||||
'password' => $oslomsg_rpc_password,
|
'password' => $oslomsg_rpc_password,
|
||||||
'ssl' => $oslomsg_rpc_use_ssl_real,
|
'ssl' => $oslomsg_rpc_use_ssl_real,
|
||||||
}),
|
}),
|
||||||
}
|
|
||||||
class { 'cinder::ceilometer' :
|
|
||||||
notification_transport_url => os_transport_url({
|
notification_transport_url => os_transport_url({
|
||||||
'transport' => $oslomsg_notify_proto,
|
'transport' => $oslomsg_notify_proto,
|
||||||
'hosts' => $oslomsg_notify_hosts,
|
'hosts' => $oslomsg_notify_hosts,
|
||||||
|
|
|
@ -106,7 +106,6 @@ class tripleo::profile::base::cinder::api (
|
||||||
ssl_cert => $tls_certfile,
|
ssl_cert => $tls_certfile,
|
||||||
ssl_key => $tls_keyfile,
|
ssl_key => $tls_keyfile,
|
||||||
}
|
}
|
||||||
include cinder::ceilometer
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if $step == 4 and $manage_type and $default_volume_type != '' {
|
if $step == 4 and $manage_type and $default_volume_type != '' {
|
||||||
|
|
|
@ -35,7 +35,6 @@ describe 'tripleo::profile::base::cinder::api' do
|
||||||
is_expected.to contain_class('tripleo::profile::base::cinder::authtoken')
|
is_expected.to contain_class('tripleo::profile::base::cinder::authtoken')
|
||||||
is_expected.to_not contain_class('cinder::api')
|
is_expected.to_not contain_class('cinder::api')
|
||||||
is_expected.to_not contain_class('tripleo::profile::base::apache')
|
is_expected.to_not contain_class('tripleo::profile::base::apache')
|
||||||
is_expected.to_not contain_class('cinder::ceilometer')
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -55,7 +54,6 @@ describe 'tripleo::profile::base::cinder::api' do
|
||||||
:keymgr_backend => 'cinder.keymgr.conf_key_mgr.ConfKeyManager',
|
:keymgr_backend => 'cinder.keymgr.conf_key_mgr.ConfKeyManager',
|
||||||
)
|
)
|
||||||
is_expected.to contain_class('tripleo::profile::base::apache')
|
is_expected.to contain_class('tripleo::profile::base::apache')
|
||||||
is_expected.to contain_class('cinder::ceilometer')
|
|
||||||
end
|
end
|
||||||
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 contain_class('tripleo::profile::base::cinder::authtoken')
|
||||||
is_expected.to_not contain_class('cinder::api')
|
is_expected.to_not contain_class('cinder::api')
|
||||||
is_expected.to_not contain_class('tripleo::profile::base::apache')
|
is_expected.to_not contain_class('tripleo::profile::base::apache')
|
||||||
is_expected.to_not contain_class('cinder::ceilometer')
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -90,7 +87,6 @@ describe 'tripleo::profile::base::cinder::api' do
|
||||||
:keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
|
:keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
|
||||||
)
|
)
|
||||||
is_expected.to contain_class('tripleo::profile::base::apache')
|
is_expected.to contain_class('tripleo::profile::base::apache')
|
||||||
is_expected.to contain_class('cinder::ceilometer')
|
|
||||||
is_expected.to contain_cinder__type('tripleo')
|
is_expected.to contain_cinder__type('tripleo')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -110,7 +106,6 @@ describe 'tripleo::profile::base::cinder::api' do
|
||||||
:keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
|
:keymgr_backend => 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager',
|
||||||
)
|
)
|
||||||
is_expected.to contain_class('tripleo::profile::base::apache')
|
is_expected.to contain_class('tripleo::profile::base::apache')
|
||||||
is_expected.to contain_class('cinder::ceilometer')
|
|
||||||
is_expected.to_not contain_cinder__type('tripleo')
|
is_expected.to_not contain_cinder__type('tripleo')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -23,7 +23,6 @@ describe 'tripleo::profile::base::cinder' do
|
||||||
it 'should do nothing' do
|
it 'should do nothing' do
|
||||||
is_expected.to contain_class('tripleo::profile::base::cinder')
|
is_expected.to contain_class('tripleo::profile::base::cinder')
|
||||||
is_expected.to_not contain_class('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::config')
|
||||||
is_expected.to_not contain_class('cinder::glance')
|
is_expected.to_not contain_class('cinder::glance')
|
||||||
is_expected.to_not contain_class('cinder::nova')
|
is_expected.to_not contain_class('cinder::nova')
|
||||||
|
@ -49,9 +48,7 @@ describe 'tripleo::profile::base::cinder' do
|
||||||
|
|
||||||
it 'should trigger complete configuration' do
|
it 'should trigger complete configuration' do
|
||||||
is_expected.to contain_class('cinder').with(
|
is_expected.to contain_class('cinder').with(
|
||||||
:default_transport_url => 'rabbit://cinder1:foo@192.168.0.1:1234/?ssl=0'
|
:default_transport_url => 'rabbit://cinder1:foo@192.168.0.1:1234/?ssl=0',
|
||||||
)
|
|
||||||
is_expected.to contain_class('cinder::ceilometer').with(
|
|
||||||
:notification_transport_url => 'rabbit://cinder2:baa@192.168.0.2:5678/?ssl=0'
|
:notification_transport_url => 'rabbit://cinder2:baa@192.168.0.2:5678/?ssl=0'
|
||||||
)
|
)
|
||||||
is_expected.to contain_class('cinder::config')
|
is_expected.to contain_class('cinder::config')
|
||||||
|
@ -71,7 +68,6 @@ describe 'tripleo::profile::base::cinder' do
|
||||||
|
|
||||||
it 'should not trigger any configuration' do
|
it 'should not trigger any configuration' do
|
||||||
is_expected.to_not contain_class('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::config')
|
||||||
is_expected.to_not contain_class('cinder::glance')
|
is_expected.to_not contain_class('cinder::glance')
|
||||||
is_expected.to_not contain_class('cinder::nova')
|
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
|
it 'should trigger cinder configuration without mysql grant' do
|
||||||
is_expected.to contain_class('cinder').with(
|
is_expected.to contain_class('cinder').with(
|
||||||
:default_transport_url => 'rabbit://cinder1:foo@192.168.0.1:1234/?ssl=0'
|
:default_transport_url => 'rabbit://cinder1:foo@192.168.0.1:1234/?ssl=0',
|
||||||
)
|
|
||||||
is_expected.to contain_class('cinder::ceilometer').with(
|
|
||||||
:notification_transport_url => 'rabbit://cinder2:baa@192.168.0.2:5678/?ssl=0'
|
:notification_transport_url => 'rabbit://cinder2:baa@192.168.0.2:5678/?ssl=0'
|
||||||
)
|
)
|
||||||
is_expected.to contain_class('cinder::config')
|
is_expected.to contain_class('cinder::config')
|
||||||
|
@ -124,7 +118,6 @@ describe 'tripleo::profile::base::cinder' do
|
||||||
is_expected.to contain_class('cinder').with(
|
is_expected.to contain_class('cinder').with(
|
||||||
:default_transport_url => 'rabbit://cinder:foo@127.0.0.1:5672/?ssl=0'
|
: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::config')
|
||||||
is_expected.to contain_class('cinder::glance')
|
is_expected.to contain_class('cinder::glance')
|
||||||
is_expected.to contain_class('cinder::nova')
|
is_expected.to contain_class('cinder::nova')
|
||||||
|
@ -148,7 +141,6 @@ describe 'tripleo::profile::base::cinder' do
|
||||||
is_expected.to contain_class('cinder').with(
|
is_expected.to contain_class('cinder').with(
|
||||||
:default_transport_url => 'rabbit://cinder:foo@127.0.0.1:5672/?ssl=0'
|
: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::config')
|
||||||
is_expected.to contain_class('cinder::glance')
|
is_expected.to contain_class('cinder::glance')
|
||||||
is_expected.to contain_class('cinder::nova')
|
is_expected.to contain_class('cinder::nova')
|
||||||
|
|
Loading…
Reference in New Issue