From 8f72166dc9259be69448c8ca1c5e5bc5f53dcd8c Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Sat, 9 Dec 2017 07:21:52 +0200 Subject: [PATCH] Fix DVS devstack configuration Ensure that empty parameters are treated correctly. Change-Id: I4a2618b6fbbea2993e3c1e1e56bc2e271a2c66d8 --- devstack/lib/vmware_dvs | 2 +- devstack/lib/vmware_nsx_tvd | 2 +- devstack/lib/vmware_nsx_v | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack/lib/vmware_dvs b/devstack/lib/vmware_dvs index 59c0c46a8c..6ff19b6677 100644 --- a/devstack/lib/vmware_dvs +++ b/devstack/lib/vmware_dvs @@ -96,7 +96,7 @@ function neutron_plugin_configure_plugin_agent { } function neutron_plugin_configure_service { - dvs_configure_service $VMWAREAPI_IP $VMWAREAPI_USER $VMWAREAPI_PASSWORD $VMWAREAPI_CA_FILE $VMWAREAPI_INSECURE $VMWARE_DVS_NAME + dvs_configure_service "$VMWAREAPI_IP" "$VMWAREAPI_USER" "$VMWAREAPI_PASSWORD" "$VMWAREAPI_CA_FILE" "$VMWAREAPI_INSECURE" "$VMWARE_DVS_NAME" iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_extension_drivers vmware_dvs_dns } diff --git a/devstack/lib/vmware_nsx_tvd b/devstack/lib/vmware_nsx_tvd index b61eb94cc6..e9140a2d25 100644 --- a/devstack/lib/vmware_nsx_tvd +++ b/devstack/lib/vmware_nsx_tvd @@ -159,7 +159,7 @@ function neutron_plugin_configure_plugin_agent { function neutron_plugin_configure_service { nsxv3_configure_service nsxv_configure_service - dvs_configure_service $DVS_VMWAREAPI_IP $DVS_VMWAREAPI_USER $DVS_VMWAREAPI_PASSWORD $DVS_VMWAREAPI_CA_FILE $DVS_VMWAREAPI_INSECURE $VMWARE_DVS_NAME + dvs_configure_service "$DVS_VMWAREAPI_IP" "$DVS_VMWAREAPI_USER" "$DVS_VMWAREAPI_PASSWORD" "$DVS_VMWAREAPI_CA_FILE" "$DVS_VMWAREAPI_INSECURE" "$VMWARE_DVS_NAME" iniset /$Q_PLUGIN_CONF_FILE nsx_tvd nsx_v_extension_drivers vmware_nsxv_dns iniset /$Q_PLUGIN_CONF_FILE nsx_tvd nsx_v3_extension_drivers vmware_nsxv3_dns iniset /$Q_PLUGIN_CONF_FILE nsx_tvd dvs_extension_drivers vmware_dvs_dns diff --git a/devstack/lib/vmware_nsx_v b/devstack/lib/vmware_nsx_v index cd206c04b5..8bdd122cbd 100644 --- a/devstack/lib/vmware_nsx_v +++ b/devstack/lib/vmware_nsx_v @@ -86,7 +86,7 @@ function neutron_plugin_configure_service { nsxv_configure_service iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_extension_drivers vmware_nsxv_dns if [[ "$NSXV_USE_DVS_FEATURES" != "" ]]; then - dvs_configure_service $VMWAREAPI_IP $VMWAREAPI_USER $VMWAREAPI_PASSWORD $VMWAREAPI_CA_FILE $VMWAREAPI_INSECURE $VMWARE_DVS_NAME + dvs_configure_service "$VMWAREAPI_IP" "$VMWAREAPI_USER" "$VMWAREAPI_PASSWORD" "$VMWAREAPI_CA_FILE" "$VMWAREAPI_INSECURE" "$VMWARE_DVS_NAME" fi }