Remove deprecated heat_service_type param

Remove the deprecated heat_service_type param which has been deprecated.

Change-Id: I22a1605a1ac583eb1d30e984ac24c02c4d92662b
This commit is contained in:
ZhongShengping 2018-05-24 11:17:38 +08:00
parent 70b9cde131
commit d116eb73c9
2 changed files with 4 additions and 9 deletions

View File

@ -322,10 +322,6 @@
# amqp (for AMQP 1.0) # amqp (for AMQP 1.0)
# Defaults to 'rabbit' # Defaults to 'rabbit'
# #
# [*heat_service_type*]
# (optional) Heat service type to use when searching catalog.
# Defaults to undef.
#
class trove( class trove(
$nova_proxy_admin_pass, $nova_proxy_admin_pass,
$default_transport_url = $::os_service_default, $default_transport_url = $::os_service_default,
@ -397,7 +393,6 @@ class trove(
$rabbit_userid = $::os_service_default, $rabbit_userid = $::os_service_default,
$rabbit_virtual_host = $::os_service_default, $rabbit_virtual_host = $::os_service_default,
$rpc_backend = 'rabbit', $rpc_backend = 'rabbit',
$heat_service_type = undef,
) { ) {
include ::trove::deps include ::trove::deps
@ -417,10 +412,6 @@ trove::rpc_backend are deprecated. Please use trove::default_transport_url \
instead.") instead.")
} }
if $heat_service_type {
warning('The heat_service_type parameter is deprecated, has no effect and will be removed in R release')
}
if $nova_compute_url { if $nova_compute_url {
trove_config { 'DEFAULT/nova_compute_url': value => $nova_compute_url } trove_config { 'DEFAULT/nova_compute_url': value => $nova_compute_url }
} }

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated trove::heat_service_type is now removed.