From fb6970de601801251a46e0b385eaecb25e7b5a66 Mon Sep 17 00:00:00 2001 From: rajinir Date: Mon, 14 May 2018 13:24:01 -0500 Subject: [PATCH] Fix for the manila backend configuration errors Fixing the manila configuration when using dell emc manila templates due to malformed emc_shared_backend hiera value manila::backend::dellemc_vnx::share_backend_name will be generically fixed for all backends in the puppet-tripleo code Closes-Bug: #1771179 Change-Id: Ibe15c5476c42b3dbeb7037ece80fbf973776c7d7 (cherry picked from commit 5f00ddde30060b0ac25aaa173644502dcaf13e4e) --- puppet/services/manila-backend-unity.yaml | 2 +- puppet/services/manila-backend-vmax.yaml | 2 +- puppet/services/manila-backend-vnx.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/puppet/services/manila-backend-unity.yaml b/puppet/services/manila-backend-unity.yaml index 8d77360374..f4549c26a8 100644 --- a/puppet/services/manila-backend-unity.yaml +++ b/puppet/services/manila-backend-unity.yaml @@ -66,7 +66,7 @@ outputs: manila::backend::dellemc_unity::driver_handles_share_servers: {get_param: ManilaUnityDriverHandlesShareServers} manila::backend::dellemc_unity::emc_nas_password: {get_param: ManilaUnityNasPassword} manila::backend::dellemc_unity::emc_nas_server: {get_param: ManilaUnityNasServer} - manila::backend::dellemc_unity::emc_share_backend: {'unity'} + manila::backend::dellemc_unity::emc_share_backend: unity manila::backend::dellemc_unity::unity_server_meta_pool: {get_param: ManilaUnityServerMetaPool} manila::backend::dellemc_unity::unity_share_data_pools: {get_param: ManilaUnityShareDataPools} manila::backend::dellemc_unity::unity_ethernet_ports: {get_param: ManilaUnityEthernetPorts} diff --git a/puppet/services/manila-backend-vmax.yaml b/puppet/services/manila-backend-vmax.yaml index e77033dcc9..1c0eef410a 100644 --- a/puppet/services/manila-backend-vmax.yaml +++ b/puppet/services/manila-backend-vmax.yaml @@ -66,7 +66,7 @@ outputs: manila::backend::dellemc_vmax::driver_handles_share_servers: {get_param: ManilaVMAXDriverHandlesShareServers} manila::backend::dellemc_vmax::emc_nas_password: {get_param: ManilaVMAXNasPassword} manila::backend::dellemc_vmax::emc_nas_server: {get_param: ManilaVMAXNasServer} - manila::backend::dellemc_vmax::emc_share_backend: {'vmax'} + manila::backend::dellemc_vmax::emc_share_backend: vmax manila::backend::dellemc_vmax::vmax_server_container: {get_param: ManilaVMAXServerContainer} manila::backend::dellemc_vmax::vmax_share_data_pools: {get_param: ManilaVMAXShareDataPools} manila::backend::dellemc_vmax::vmax_ethernet_ports: {get_param: ManilaVMAXEthernetPorts} diff --git a/puppet/services/manila-backend-vnx.yaml b/puppet/services/manila-backend-vnx.yaml index ba088c2fee..f21df04bad 100644 --- a/puppet/services/manila-backend-vnx.yaml +++ b/puppet/services/manila-backend-vnx.yaml @@ -66,7 +66,7 @@ outputs: manila::backend::dellemc_vnx::driver_handles_share_servers: {get_param: ManilaVNXDriverHandlesShareServers} manila::backend::dellemc_vnx::emc_nas_password: {get_param: ManilaVNXNasPassword} manila::backend::dellemc_vnx::emc_nas_server: {get_param: ManilaVNXNasServer} - manila::backend::dellemc_vnx::emc_share_backend: {'vnx'} + manila::backend::dellemc_vnx::emc_share_backend: vnx manila::backend::dellemc_vnx::vnx_server_container: {get_param: ManilaVNXServerContainer} manila::backend::dellemc_vnx::vnx_share_data_pools: {get_param: ManilaVNXShareDataPools} manila::backend::dellemc_vnx::vnx_ethernet_ports: {get_param: ManilaVNXEthernetPorts}