From a897fe3b715ae16ad1b649cd6315e0b8279ef7e7 Mon Sep 17 00:00:00 2001 From: rajinir Date: Tue, 27 Mar 2018 10:42:55 -0500 Subject: [PATCH] Dell EMC SC: Fix the excluded_domain_ip value Exclude the Dell SC cinder driver 'excluded_domain_ip' if it is not specified Closes Bug: #1758145 Change-Id: Iabeb5553f2505dff97901ac73d10030f6b215453 --- manifests/backend/dellsc_iscsi.pp | 7 ++++++- releasenotes/notes/sc-driver-d428e372280c44e8.yaml | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/sc-driver-d428e372280c44e8.yaml diff --git a/manifests/backend/dellsc_iscsi.pp b/manifests/backend/dellsc_iscsi.pp index 5fe0456a..ebd7b040 100644 --- a/manifests/backend/dellsc_iscsi.pp +++ b/manifests/backend/dellsc_iscsi.pp @@ -121,13 +121,18 @@ default of \"vol\" and will be changed to the upstream OpenStack default in N-re "${name}/dell_sc_verify_cert": value => $dell_sc_verify_cert; "${name}/dell_sc_volume_folder": value => $dell_sc_volume_folder; "${name}/iscsi_port": value => $iscsi_port; - "${name}/excluded_domain_ip": value => $excluded_domain_ip; "${name}/secondary_san_ip": value => $secondary_san_ip; "${name}/secondary_san_login": value => $secondary_san_login; "${name}/secondary_san_password": value => $secondary_san_password; "${name}/secondary_sc_api_port": value => $secondary_sc_api_port; } + if $excluded_domain_ip { + cinder_config { + "${name}/excluded_domain_ip": value => $excluded_domain_ip; + } + } + if $manage_volume_type { cinder_type { $volume_backend_name: ensure => present, diff --git a/releasenotes/notes/sc-driver-d428e372280c44e8.yaml b/releasenotes/notes/sc-driver-d428e372280c44e8.yaml new file mode 100644 index 00000000..b2b9e955 --- /dev/null +++ b/releasenotes/notes/sc-driver-d428e372280c44e8.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - Fixes `bug 1758145 + `__ + to ignore the excluded_domain_ip Dell EMC SC Driver when blank.