Remove cinder::ceilometer
Deprecated last cycle and moved to cinder class. Change-Id: If1cc5acba7ea77125b12e29a2b0fd741d2b8da80
This commit is contained in:
parent
4f41338ab4
commit
8e0d2e2537
@ -1,29 +0,0 @@
|
||||
# == Class: cinder::ceilometer
|
||||
#
|
||||
# DEPRECATED!
|
||||
# Setup Cinder to enable ceilometer can retrieve volume samples
|
||||
#
|
||||
# === Parameters
|
||||
#
|
||||
# [*notification_transport_url*]
|
||||
# (Optional) A URL representing the messaging driver to use for notifications
|
||||
# and its full configuration. Transport URLs take the form:
|
||||
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*notification_driver*]
|
||||
# (Option) Driver or drivers to handle sending notifications.
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*notification_topics*]
|
||||
# (Optional) AMQP topic used for OpenStack notifications
|
||||
# Defaults to undef
|
||||
#
|
||||
class cinder::ceilometer (
|
||||
$notification_transport_url = undef,
|
||||
$notification_driver = undef,
|
||||
$notification_topics = undef,
|
||||
) {
|
||||
|
||||
warning('cinder::ceilometer is deprecated and has no effect')
|
||||
}
|
@ -379,18 +379,10 @@ class cinder (
|
||||
control_exchange => $control_exchange,
|
||||
}
|
||||
|
||||
# TODO(tobias-urdin): Remove pick's when cinder::ceilometer is removed.
|
||||
$notification_transport_url_real = pick($cinder::ceilometer::notification_transport_url,
|
||||
$notification_transport_url)
|
||||
$notification_driver_real = pick($cinder::ceilometer::notification_driver,
|
||||
$notification_driver)
|
||||
$notification_topics_real = pick($cinder::ceilometer::notification_topics,
|
||||
$notification_topics)
|
||||
|
||||
oslo::messaging::notifications { 'cinder_config':
|
||||
transport_url => $notification_transport_url_real,
|
||||
driver => $notification_driver_real,
|
||||
topics => $notification_topics_real,
|
||||
transport_url => $notification_transport_url,
|
||||
driver => $notification_driver,
|
||||
topics => $notification_topics,
|
||||
}
|
||||
|
||||
if ! $default_availability_zone {
|
||||
|
@ -0,0 +1,5 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
The cinder::ceilometer class is removed, set the parameters in the cinder
|
||||
class directly instead.
|
Loading…
x
Reference in New Issue
Block a user