From 8267730a90c9ce79253ee9d3143bf0cf5a40fd4d Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 2 Nov 2016 10:52:53 +0800 Subject: [PATCH] Remove listen option The previously deprecated config option ``listen```of the group ``serial_console`` has been removed, as it was never used in the code. Change-Id: If2acdf6d40a7bfa3b1c33c9956c30f9a3a3e9e8e --- manifests/compute/serial.pp | 23 ++++--------------- ...onsole_listen_option-23a962e6f32861d3.yaml | 4 ++++ 2 files changed, 8 insertions(+), 19 deletions(-) create mode 100644 releasenotes/notes/remove_deprecated_serial_console_listen_option-23a962e6f32861d3.yaml diff --git a/manifests/compute/serial.pp b/manifests/compute/serial.pp index e1b6a32b7..422c0af2d 100644 --- a/manifests/compute/serial.pp +++ b/manifests/compute/serial.pp @@ -17,33 +17,18 @@ # should connect (string value) # Defaults to 127.0.0.1 # -# DEPRECATED PARAMETERS -# [*listen*] -# This option has no effect anymore. Please use "proxyclient_address" instead -# This option is deprecated and will be removed in future releases -# Defaults to undef -# class nova::compute::serial( - $port_range = '10000:20000', - $base_url = 'ws://127.0.0.1:6083/', - $proxyclient_address = '127.0.0.1', - # DEPRECATED PARAMETERS - $listen = undef, + $port_range = '10000:20000', + $base_url = 'ws://127.0.0.1:6083/', + $proxyclient_address = '127.0.0.1', ) { include ::nova::deps - if $listen { - warning('The listen parameter has no effect anymore, please use proxyclient_address instead.') - $proxyclient_address_real = $listen - } else { - $proxyclient_address_real = $proxyclient_address - } - nova_config { 'serial_console/enabled': value => true; 'serial_console/port_range': value => $port_range; 'serial_console/base_url': value => $base_url; - 'serial_console/proxyclient_address': value => $proxyclient_address_real; + 'serial_console/proxyclient_address': value => $proxyclient_address; } } diff --git a/releasenotes/notes/remove_deprecated_serial_console_listen_option-23a962e6f32861d3.yaml b/releasenotes/notes/remove_deprecated_serial_console_listen_option-23a962e6f32861d3.yaml new file mode 100644 index 000000000..9d88772da --- /dev/null +++ b/releasenotes/notes/remove_deprecated_serial_console_listen_option-23a962e6f32861d3.yaml @@ -0,0 +1,4 @@ +--- +deprecations: + - The previously deprecated config option ``listen```of the group + ``serial_console`` has been removed.