summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--manifests/profile/base/manila/api.pp11
-rw-r--r--manifests/profile/pacemaker/cinder/backup_bundle.pp5
-rw-r--r--manifests/profile/pacemaker/cinder/volume_bundle.pp5
-rw-r--r--manifests/profile/pacemaker/manila.pp45
-rw-r--r--manifests/profile/pacemaker/manila/share_bundle.pp5
-rw-r--r--releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml4
-rw-r--r--releasenotes/notes/unity_driver_afa347d073cd11e7.yaml4
7 files changed, 77 insertions, 2 deletions
diff --git a/manifests/profile/base/manila/api.pp b/manifests/profile/base/manila/api.pp
index 25c3890..a86c5b2 100644
--- a/manifests/profile/base/manila/api.pp
+++ b/manifests/profile/base/manila/api.pp
@@ -29,6 +29,13 @@
# [*backend_vmax_enabled*]
# (Optional) Whether or not the vmax backend is enabled
# Defaults to hiera('manila_backend_vmax_enabled', false)
+# [*backend_isilon_enabled*]
+# (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
@@ -47,6 +54,8 @@ class tripleo::profile::base::manila::api (
$backend_generic_enabled = hiera('manila_backend_generic_enabled', false),
$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')),
@@ -60,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 {
+ 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 {
diff --git a/manifests/profile/pacemaker/cinder/backup_bundle.pp b/manifests/profile/pacemaker/cinder/backup_bundle.pp
index 2a82c3e..9c897af 100644
--- a/manifests/profile/pacemaker/cinder/backup_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/backup_bundle.pp
@@ -134,6 +134,11 @@ class tripleo::profile::pacemaker::cinder::backup_bundle (
'target-dir' => '/var/log/cinder',
'options' => 'rw',
},
+ 'ceph-cfg-dir' => {
+ 'source-dir' => '/etc/ceph',
+ 'target-dir' => '/etc/ceph',
+ 'options' => 'ro',
+ },
},
}
}
diff --git a/manifests/profile/pacemaker/cinder/volume_bundle.pp b/manifests/profile/pacemaker/cinder/volume_bundle.pp
index 8d58036..2b0411f 100644
--- a/manifests/profile/pacemaker/cinder/volume_bundle.pp
+++ b/manifests/profile/pacemaker/cinder/volume_bundle.pp
@@ -134,6 +134,11 @@ class tripleo::profile::pacemaker::cinder::volume_bundle (
'target-dir' => '/var/log/cinder',
'options' => 'rw',
},
+ 'ceph-cfg-dir' => {
+ 'source-dir' => '/etc/ceph',
+ 'target-dir' => '/etc/ceph',
+ 'options' => 'ro',
+ },
},
}
}
diff --git a/manifests/profile/pacemaker/manila.pp b/manifests/profile/pacemaker/manila.pp
index 3fb4e0b..d21c9c4 100644
--- a/manifests/profile/pacemaker/manila.pp
+++ b/manifests/profile/pacemaker/manila.pp
@@ -30,6 +30,14 @@
# (Optional) Whether or not the vmax backend is enabled
# Defaults to hiera('manila_backend_vmax_enabled', false)
#
+# [*backend_isilon_enabled*]
+# (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 +59,8 @@ class tripleo::profile::pacemaker::manila (
$backend_generic_enabled = hiera('manila_backend_generic_enabled', false),
$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')),
@@ -171,15 +181,48 @@ 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'),
+ }
+ }
+ # manila isilon:
+ if $backend_isilon_enabled {
+ $manila_isilon_backend = hiera('manila::backend::dellemc_isilon::title')
+ manila::backend::dellemc_isilon { $manila_isilon_backend :
+ driver_handles_share_servers => hiera('manila::backend::dellemc_isilon::driver_handles_share_servers', false),
+ emc_nas_login => hiera('manila::backend::dellemc_isilon::emc_nas_login'),
+ emc_nas_password => hiera('manila::backend::dellemc_isilon::emc_nas_password'),
+ emc_nas_server => hiera('manila::backend::dellemc_isilon::emc_nas_server'),
+ emc_share_backend => hiera('manila::backend::dellemc_isilon::emc_share_backend','isilon'),
+ share_backend_name => hiera('manila::backend::dellemc_isilon::share_backend_name'),
+ emc_nas_root_dir => hiera('manila::backend::dellemc_isilon::emc_nas_root_dir'),
+ emc_nas_server_port => hiera('manila::backend::dellemc_isilon::emc_server_port'),
+ emc_nas_server_secure => hiera('manila::backend::dellemc_isilon::emc_nas_secure'),
+ }
+ }
+
$manila_enabled_backends = delete_undef_values(
[
$manila_generic_backend,
$manila_cephfsnative_backend,
$manila_netapp_backend,
- $manila_vmax_backend
+ $manila_vmax_backend,
+ $manila_isilon_backend,
+ $manila_unity_backend
]
)
class { '::manila::backends' :
diff --git a/manifests/profile/pacemaker/manila/share_bundle.pp b/manifests/profile/pacemaker/manila/share_bundle.pp
index 0e6c60c..0893bf0 100644
--- a/manifests/profile/pacemaker/manila/share_bundle.pp
+++ b/manifests/profile/pacemaker/manila/share_bundle.pp
@@ -129,6 +129,11 @@ class tripleo::profile::pacemaker::manila::share_bundle (
'target-dir' => '/var/log/manila',
'options' => 'rw',
},
+ 'ceph-cfg-dir' => {
+ 'source-dir' => '/etc/ceph',
+ 'target-dir' => '/etc/ceph',
+ 'options' => 'ro',
+ },
},
}
}
diff --git a/releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml b/releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml
new file mode 100644
index 0000000..e6dad75
--- /dev/null
+++ b/releasenotes/notes/isilon_driver_bfa347d073cd11e7.yaml
@@ -0,0 +1,4 @@
+---
+features:
+ - |
+ Add support to configure Dell EMC Isilon backend
diff --git a/releasenotes/notes/unity_driver_afa347d073cd11e7.yaml b/releasenotes/notes/unity_driver_afa347d073cd11e7.yaml
new file mode 100644
index 0000000..09f0fa6
--- /dev/null
+++ b/releasenotes/notes/unity_driver_afa347d073cd11e7.yaml
@@ -0,0 +1,4 @@
+---
+features:
+ - |
+ Add support to configure Dell EMC Unity backend