openstack
/
puppet-tripleo
Code Issues Proposed changes

Support for Dell EMC Unity Manila Driver 

This changes adds Dell EMC Unity backend as composable service
and matches the tripleo-heat-templates.

Change-Id: I0df1e16db89cd53e4f16cd08ccb975d8e7e9a470
Implements: blueprint dellemc-unity-manila
This commit is contained in:
rajinir 2017-08-03 11:13:19 -05:00 committed by Emilien Macchi
parent 75ee7f12f1
commit 2f93b4fc3a
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/profile/base/manila/api.pp
View File

@ -33,6 +33,10 @@
# (Optional) Whether or not the isilon backend is enabled
# Defaults to hiera('manila_backend_isilon_enabled', false)
#
# [*backend_unity_enabled*]
# (Optional) Whether or not the unity backend is enabled
# Defaults to hiera('manila_backend_unity_enabled', false)
#
# [*backend_cephfs_enabled*]
# (Optional) Whether or not the cephfs backend is enabled
# Defaults to hiera('manila_backend_cephfs_enabled', false)
@ -51,6 +55,7 @@ class tripleo::profile::base::manila::api (
$backend_netapp_enabled = hiera('manila_backend_netapp_enabled', false),
$backend_vmax_enabled = hiera('manila_backend_vmax_enabled', false),
$backend_isilon_enabled = hiera('manila_backend_isilon_enabled', false),
$backend_unity_enabled = hiera('manila_backend_unity_enabled', false),
$backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false),
$bootstrap_node = hiera('bootstrap_nodeid', undef),
$step = Integer(hiera('step')),
@ -64,7 +69,7 @@ class tripleo::profile::base::manila::api (
include ::tripleo::profile::base::manila
if $step >= 4 or ($step >= 3 and $sync_db) {
if $backend_generic_enabled or $backend_netapp_enabled or $backend_vmax_enabled or $backend_isilon_enabled {
if $backend_generic_enabled or $backend_netapp_enabled or $backend_vmax_enabled or $backend_isilon_enabled or $backend_unity_enabled {
$nfs_protocol = 'NFS'
$cifs_protocol = 'CIFS'
} else {

23
manifests/profile/pacemaker/manila.pp
View File

@ -34,6 +34,10 @@
# (Optional) Whether or not the isilon backend is enabled
# Defaults to hiera('manila_backend_isilon_enabled', false)
#
# [*backend_unity_enabled*]
# (Optional) Whether or not the unity backend is enabled
# Defaults to hiera('manila_backend_unity_enabled', false)
#
# [*backend_cephfs_enabled*]
# (Optional) Whether or not the cephfs backend is enabled
# Defaults to hiera('manila_backend_cephfs_enabled', false)
@ -56,6 +60,7 @@ class tripleo::profile::pacemaker::manila (
$backend_netapp_enabled = hiera('manila_backend_netapp_enabled', false),
$backend_vmax_enabled = hiera('manila_backend_vmax_enabled', false),
$backend_isilon_enabled = hiera('manila_backend_isilon_enabled', false),
$backend_unity_enabled = hiera('manila_backend_unity_enabled', false),
$backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false),
$bootstrap_node = hiera('manila_share_short_bootstrap_node_name'),
$step = Integer(hiera('step')),
@ -176,6 +181,21 @@ class tripleo::profile::pacemaker::manila (
vmax_ethernet_ports => hiera('manila::backend::dellemc_vmax::vmax_ethernet_ports'),
}
}
# manila unity:
if $backend_unity_enabled {
$manila_unity_backend = hiera('manila::backend::dellemc_unity::title')
manila::backend::dellemc_unity { $manila_unity_backend :
driver_handles_share_servers => hiera('manila::backend::dellemc_unity::driver_handles_share_servers', true),
emc_nas_login => hiera('manila::backend::dellemc_unity::emc_nas_login'),
emc_nas_password => hiera('manila::backend::dellemc_unity::emc_nas_password'),
emc_nas_server => hiera('manila::backend::dellemc_unity::emc_nas_server'),
emc_share_backend => hiera('manila::backend::dellemc_unity::emc_share_backend','unity'),
share_backend_name => hiera('manila::backend::dellemc_unity::share_backend_name'),
unity_server_meta_pool => hiera('manila::backend::dellemc_unity::unity_server_meta_pool'),
unity_share_data_pools => hiera('manila::backend::dellemc_unity::unity_share_data_pools'),
unity_ethernet_ports => hiera('manila::backend::dellemc_unity::unity_ethernet_ports'),
}
}
@ -201,7 +221,8 @@ class tripleo::profile::pacemaker::manila (
$manila_cephfsnative_backend,
$manila_netapp_backend,
$manila_vmax_backend,
$manila_isilon_backend
$manila_isilon_backend,
$manila_unity_backend
]
)
class { '::manila::backends' :

4
releasenotes/notes/unity_driver_afa347d073cd11e7.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
Add support to configure Dell EMC Unity backend