From 94b6674c65fd82088e9c1256ca41b5c1316988cf Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Mon, 18 Sep 2017 16:01:22 +0800 Subject: [PATCH] Remove useless options These parameters are no longer used. Change-Id: I522987408097f07b97bb9efaeea3981412d4b88e --- manifests/network/neutron.pp | 14 -------------- .../remove-useless-options-a93512d9834fe223.yaml | 5 +++++ 2 files changed, 5 insertions(+), 14 deletions(-) create mode 100644 releasenotes/notes/remove-useless-options-a93512d9834fe223.yaml diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp index e5a310a76..8512f7263 100644 --- a/manifests/network/neutron.pp +++ b/manifests/network/neutron.pp @@ -111,17 +111,6 @@ # and not the Identity service API IP and port. # Use neutron_auth_url instead. # -# [*neutron_default_tenant_id*] -# (optional) DEPRECATED. Default tenant id when creating neutron networks -# -# [*neutron_auth_plugin*] -# Name of the plugin to load (string value) -# Defaults to undef -# -# [*neutron_ca_certificates_file*] -# (optional) Location of ca certicates file to use for neutronclient requests. -# Defaults to undef -# class nova::network::neutron ( $neutron_password = false, $neutron_auth_type = 'v3password', @@ -140,9 +129,6 @@ class nova::network::neutron ( $vif_plugging_timeout = '300', $dhcp_domain = 'novalocal', $default_floating_pool = 'nova', - $neutron_default_tenant_id = undef, - $neutron_auth_plugin = undef, - $neutron_ca_certificates_file = undef, ) { include ::nova::deps diff --git a/releasenotes/notes/remove-useless-options-a93512d9834fe223.yaml b/releasenotes/notes/remove-useless-options-a93512d9834fe223.yaml new file mode 100644 index 000000000..77ea477b0 --- /dev/null +++ b/releasenotes/notes/remove-useless-options-a93512d9834fe223.yaml @@ -0,0 +1,5 @@ +--- +other: + - removed useless option nova::network::neutron::neutron_default_tenant_id + - removed useless option nova::network::neutron::neutron_auth_plugin + - removed useless option nova::network::neutron::neutron_ca_certificates_file