openstack
/
puppet-tripleo
Code Issues Proposed changes

Manila: Replace hiera by lookup 

The hiera function is deprecated and does not work with the latest
hieradata version 5. It should be replaced by the new lookup
function[1].

[1] https://puppet.com/docs/puppet/7/hiera_automatic.html

With the lookup function, we can define value type and merge behavior,
but these are kept default at this moment to limit scope of this change
to just simple replacement. Adding value type might be useful to make
sure the value is in expected type (especially when a boolean value is
expected), but we will revisit that later.

example:
lookup(<NAME>, [<VALUE TYPE>], [<MERGE BEHAVIOR>], [<DEFAULT VALUE>])

Change-Id: I2614b8f42c45ba9f5143d51401c1d48d469a4ef8
This commit is contained in:
katarimanoj 2022-04-19 20:34:50 +05:30 committed by Takashi Kajinami
parent 0d4c161669
commit 470086b16e
5 changed files with 208 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
manifests/profile/base/manila.pp
View File

@ -20,75 +20,75 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('manila_api_short_bootstrap_node_name')
# Defaults to lookup('manila_api_short_bootstrap_node_name', undef, undef, undef)
#
# [*step*]
# (Optional) The current step of the deployment
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*oslomsg_rpc_proto*]
# Protocol driver for the oslo messaging rpc service
# Defaults to hiera('oslo_messaging_rpc_scheme', rabbit)
# Defaults to lookup('oslo_messaging_rpc_scheme', undef, undef, 'rabbit')
#
# [*oslomsg_rpc_hosts*]
# list of the oslo messaging rpc host fqdns
# Defaults to hiera('oslo_messaging_rpc_node_names')
# Defaults to any2array(lookup('oslo_messaging_rpc_node_names', undef, undef, undef))
#
# [*oslomsg_rpc_port*]
# IP port for oslo messaging rpc service
# Defaults to hiera('oslo_messaging_rpc_port', 5672)
# Defaults to lookup('oslo_messaging_rpc_port', undef, undef, '5672')
#
# [*oslomsg_rpc_username*]
# Username for oslo messaging rpc service
# Defaults to hiera('oslo_messaging_rpc_user_name', 'guest')
# Defaults to lookup('oslo_messaging_rpc_user_name', undef, undef, 'guest')
#
# [*oslomsg_rpc_password*]
# Password for oslo messaging rpc service
# Defaults to hiera('oslo_messaging_rpc_password')
# Defaults to lookup('oslo_messaging_rpc_password')
#
# [*oslomsg_rpc_use_ssl*]
# Enable ssl oslo messaging services
# Defaults to hiera('oslo_messaging_rpc_use_ssl', '0')
# Defaults to lookup('oslo_messaging_rpc_use_ssl', undef, undef, '0')
#
# [*oslomsg_notify_proto*]
# Protocol driver for the oslo messaging notify service
# Defaults to hiera('oslo_messaging_notify_scheme', rabbit)
# Defaults to lookup('oslo_messaging_notify_scheme', undef, undef, 'rabbit')
#
# [*oslomsg_notify_hosts*]
# list of the oslo messaging notify host fqdns
# Defaults to hiera('oslo_messaging_notify_node_names')
# Defaults to any2array(lookup('oslo_messaging_notify_node_names', undef, undef, undef))
#
# [*oslomsg_notify_port*]
# IP port for oslo messaging notify service
# Defaults to hiera('oslo_messaging_notify_port', 5672)
# Defaults to lookup('oslo_messaging_notify_port', undef, undef, '5672')
#
# [*oslomsg_notify_username*]
# Username for oslo messaging notify service
# Defaults to hiera('oslo_messaging_notify_user_name', 'guest')
# Defaults to lookup('oslo_messaging_notify_user_name', undef, undef, 'guest')
#
# [*oslomsg_notify_password*]
# Password for oslo messaging notify service
# Defaults to hiera('oslo_messaging_notify_password')
# Defaults to lookup('oslo_messaging_notify_password')
#
# [*oslomsg_notify_use_ssl*]
# Enable ssl oslo messaging services
# Defaults to hiera('oslo_messaging_notify_use_ssl', '0')
# Defaults to lookup('oslo_messaging_notify_use_ssl', undef, undef, '0')
class tripleo::profile::base::manila (
$bootstrap_node = hiera('manila_api_short_bootstrap_node_name', undef),
$step = Integer(hiera('step')),
$oslomsg_rpc_proto = hiera('oslo_messaging_rpc_scheme', 'rabbit'),
$oslomsg_rpc_hosts = any2array(hiera('oslo_messaging_rpc_node_names', undef)),
$oslomsg_rpc_password = hiera('oslo_messaging_rpc_password'),
$oslomsg_rpc_port = hiera('oslo_messaging_rpc_port', '5672'),
$oslomsg_rpc_username = hiera('oslo_messaging_rpc_user_name', 'guest'),
$oslomsg_rpc_use_ssl = hiera('oslo_messaging_rpc_use_ssl', '0'),
$oslomsg_notify_proto = hiera('oslo_messaging_notify_scheme', 'rabbit'),
$oslomsg_notify_hosts = any2array(hiera('oslo_messaging_notify_node_names', undef)),
$oslomsg_notify_password = hiera('oslo_messaging_notify_password'),
$oslomsg_notify_port = hiera('oslo_messaging_notify_port', '5672'),
$oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
$oslomsg_notify_use_ssl = hiera('oslo_messaging_notify_use_ssl', '0'),
$bootstrap_node = lookup('manila_api_short_bootstrap_node_name', undef, undef, undef),
$step = Integer(lookup('step')),
$oslomsg_rpc_proto = lookup('oslo_messaging_rpc_scheme', undef, undef, 'rabbit'),
$oslomsg_rpc_hosts = any2array(lookup('oslo_messaging_rpc_node_names', undef, undef, undef)),
$oslomsg_rpc_password = lookup('oslo_messaging_rpc_password'),
$oslomsg_rpc_port = lookup('oslo_messaging_rpc_port', undef, undef, '5672'),
$oslomsg_rpc_username = lookup('oslo_messaging_rpc_user_name', undef, undef, 'guest'),
$oslomsg_rpc_use_ssl = lookup('oslo_messaging_rpc_use_ssl', undef, undef, '0'),
$oslomsg_notify_proto = lookup('oslo_messaging_notify_scheme', undef, undef, 'rabbit'),
$oslomsg_notify_hosts = any2array(lookup('oslo_messaging_notify_node_names', undef, undef, undef)),
$oslomsg_notify_password = lookup('oslo_messaging_notify_password'),
$oslomsg_notify_port = lookup('oslo_messaging_notify_port', undef, undef, '5672'),
$oslomsg_notify_username = lookup('oslo_messaging_notify_user_name', undef, undef, 'guest'),
$oslomsg_notify_use_ssl = lookup('oslo_messaging_notify_use_ssl', undef, undef, '0'),
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
$sync_db = true

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

@ -20,47 +20,47 @@
#
# [*enabled_share_protocols*]
# (Optional) Share protocols enabled on the manila API service.
# Defaults to hiera('manila_enabled_share_protocols', undef)
# Defaults to lookup('manila_enabled_share_protocols', undef, undef, undef)
#
# [*backend_generic_enabled*]
# (Optional) Whether or not the generic backend is enabled
# Defaults to hiera('manila_backend_generic_enabled', false)
# Defaults to lookup('manila_backend_generic_enabled', undef, undef, false)
#
# [*backend_netapp_enabled*]
# (Optional) Whether or not the netapp backend is enabled
# Defaults to hiera('manila_backend_netapp_enabled', false)
# Defaults to lookup('manila_backend_netapp_enabled', undef, undef, false)
#
# [*backend_vmax_enabled*]
# (Optional) Whether or not the vmax backend is enabled
# Defaults to hiera('manila_backend_vmax_enabled', false)
# Defaults to lookup('manila_backend_vmax_enabled', undef, undef, false)
#
# [*backend_powermax_enabled*]
# (Optional) Whether or not the powermax backend is enabled
# Defaults to hiera('manila_backend_powermax_enabled', false)
# Defaults to lookup('manila_backend_powermax_enabled', undef, undef, false)
#
# [*backend_isilon_enabled*]
# (Optional) Whether or not the isilon backend is enabled
# Defaults to hiera('manila_backend_isilon_enabled', false)
# Defaults to lookup('manila_backend_isilon_enabled', undef, undef, false)
#
# [*backend_unity_enabled*]
# (Optional) Whether or not the unity backend is enabled
# Defaults to hiera('manila_backend_unity_enabled', false)
# Defaults to lookup('manila_backend_unity_enabled', undef, undef, false)
#
# [*backend_vnx_enabled*]
# (Optional) Whether or not the vnx backend is enabled
# Defaults to hiera('manila_backend_vnx_enabled', false)
# Defaults to lookup('manila_backend_vnx_enabled', undef, undef, false)
#
# [*backend_flashblade_enabled*]
# (Optional) Whether or not the flashblade backend is enabled
# Defaults to hiera('manila_backend_flashblade_enabled', false)
# Defaults to lookup('manila_backend_flashblade_enabled', undef, undef, false)
#
# [*backend_cephfs_enabled*]
# (Optional) Whether or not the cephfs backend is enabled
# Defaults to hiera('manila_backend_cephfs_enabled', false)
# Defaults to lookup('manila_backend_cephfs_enabled', undef, undef, false)
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('manila_api_short_bootstrap_node_name')
# Defaults to lookup('manila_api_short_bootstrap_node_name', undef, undef, undef)
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -72,42 +72,42 @@
# service_certificate: <service certificate path>
# service_key: <service key path>
# principal: "haproxy/<overcloud controller fqdn>"
# Defaults to hiera('apache_certificate_specs', {}).
# Defaults to lookup('apache_certificates_specs', undef, undef, {}).
#
# [*manila_api_network*]
# (Optional) The network name where the manila API endpoint is listening on.
# This is set by t-h-t.
# Defaults to hiera('manila_api_network', undef)
# Defaults to lookup('manila_api_network', undef, undef, undef)
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
# Defaults to hiera('enable_internal_tls', false)
# Defaults to lookup('enable_internal_tls', undef, undef, false)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*manila_enable_db_purge*]
# (Optional) Whether to enable db purging
# Defaults to true
#
class tripleo::profile::base::manila::api (
$enabled_share_protocols = hiera('manila_enabled_share_protocols', undef),
$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_powermax_enabled = hiera('manila_backend_powermax_enabled', false),
$backend_isilon_enabled = hiera('manila_backend_isilon_enabled', false),
$backend_unity_enabled = hiera('manila_backend_unity_enabled', false),
$backend_vnx_enabled = hiera('manila_backend_vnx_enabled', false),
$backend_flashblade_enabled = hiera('manila_backend_flashblade_enabled', false),
$backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false),
$bootstrap_node = hiera('manila_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$manila_api_network = hiera('manila_api_network', undef),
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step')),
$enabled_share_protocols = lookup('manila_enabled_share_protocols', undef, undef, undef),
$backend_generic_enabled = lookup('manila_backend_generic_enabled', undef, undef, false),
$backend_netapp_enabled = lookup('manila_backend_netapp_enabled', undef, undef, false),
$backend_vmax_enabled = lookup('manila_backend_vmax_enabled', undef, undef, false),
$backend_powermax_enabled = lookup('manila_backend_powermax_enabled', undef, undef, false),
$backend_isilon_enabled = lookup('manila_backend_isilon_enabled', undef, undef, false),
$backend_unity_enabled = lookup('manila_backend_unity_enabled', undef, undef, false),
$backend_vnx_enabled = lookup('manila_backend_vnx_enabled', undef, undef, false),
$backend_flashblade_enabled = lookup('manila_backend_flashblade_enabled', undef, undef, false),
$backend_cephfs_enabled = lookup('manila_backend_cephfs_enabled', undef, undef, false),
$bootstrap_node = lookup('manila_api_short_bootstrap_node_name', undef, undef, undef),
$certificates_specs = lookup('apache_certificates_specs', undef, undef, {}),
$manila_api_network = lookup('manila_api_network', undef, undef, undef),
$enable_internal_tls = lookup('enable_internal_tls', undef, undef, false),
$step = Integer(lookup('step')),
$manila_enable_db_purge = true,
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
@ -147,8 +147,8 @@ class tripleo::profile::base::manila::api (
$cifs_protocol = undef
}
if $backend_cephfs_enabled {
$cephfs_protocol = hiera(
'manila::backend::cephfs::cephfs_protocol_helper_type', 'CEPHFS')
$cephfs_protocol = lookup(
'manila::backend::cephfs::cephfs_protocol_helper_type', undef, undef, 'CEPHFS')
} else {
$cephfs_protocol = undef
}

24
manifests/profile/base/manila/authtoken.pp
View File

@ -21,28 +21,28 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# [*memcached_hosts*]
# (Optional) Array of hostnames, ipv4 or ipv6 addresses for memcache.
# Defaults to hiera('memcached_node_names', [])
# Defaults to lookup('memcached_node_names', undef, undef, [])
#
# [*memcached_port*]
# (Optional) Memcached port to use.
# Defaults to hiera('memcached_authtoken_port', 11211)
# Defaults to lookup('memcached_authtoken_port', undef, undef, 11211)
#
# [*memcached_ipv6*]
# (Optional) Whether Memcached uses IPv6 network instead of IPv4 network.
# Defauls to hiera('memcached_ipv6', false)
# Defauls to lookup('memcached_ipv6', undef, undef, false)
#
# [*security_strategy*]
# (Optional) Memcached (authtoken) security strategy.
# Defaults to hiera('memcached_authtoken_security_strategy', undef)
# Defaults to lookup('memcached_authtoken_security_strategy', undef, undef, undef)
#
# [*secret_key*]
# (Optional) Memcached (authtoken) secret key, used with security_strategy.
# The key is hashed with a salt, to isolate services.
# Defaults to hiera('memcached_authtoken_secret_key', undef)
# Defaults to lookup('memcached_authtoken_secret_key', undef, undef, undef)
#
# DEPRECATED PARAMETERS
#
@ -51,12 +51,12 @@
# Defaults to undef
#
class tripleo::profile::base::manila::authtoken (
$step = Integer(hiera('step')),
$memcached_hosts = hiera('memcached_node_names', []),
$memcached_port = hiera('memcached_authtoken_port', 11211),
$memcached_ipv6 = hiera('memcached_ipv6', false),
$security_strategy = hiera('memcached_authtoken_security_strategy', undef),
$secret_key = hiera('memcached_authtoken_secret_key', undef),
$step = Integer(lookup('step')),
$memcached_hosts = lookup('memcached_node_names', undef, undef, []),
$memcached_port = lookup('memcached_authtoken_port', undef, undef, 11211),
$memcached_ipv6 = lookup('memcached_ipv6', undef, undef, false),
$security_strategy = lookup('memcached_authtoken_security_strategy', undef, undef, undef),
$secret_key = lookup('memcached_authtoken_secret_key', undef, undef, undef),
# DEPRECATED PARAMETERS
$memcached_ips = undef
) {

4
manifests/profile/base/manila/scheduler.pp
View File

@ -21,10 +21,10 @@
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::manila::scheduler (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::manila

267
manifests/profile/base/manila/share.pp
View File

@ -20,61 +20,61 @@
#
# [*backend_generic_enabled*]
# (Optional) Whether or not the generic backend is enabled
# Defaults to hiera('manila_backend_generic_enabled', false)
# Defaults to lookup('manila_backend_generic_enabled', undef, undef, false)
#
# [*backend_netapp_enabled*]
# (Optional) Whether or not the netapp backend is enabled
# Defaults to hiera('manila_backend_netapp_enabled', false)
# Defaults to lookup('manila_backend_netapp_enabled', undef, undef, false)
#
# [*backend_vmax_enabled*]
# (Optional) Whether or not the vmax backend is enabled
# Defaults to hiera('manila_backend_vmax_enabled', false)
# Defaults to lookup('manila_backend_vmax_enabled', undef, undef, false)
#
# [*backend_powermax_enabled*]
# (Optional) Whether or not the powermax backend is enabled
# Defaults to hiera('manila_backend_powermax_enabled', false)
# Defaults to lookup('manila_backend_powermax_enabled', undef, undef, false)
#
# [*backend_isilon_enabled*]
# (Optional) Whether or not the isilon backend is enabled
# Defaults to hiera('manila_backend_isilon_enabled', false)
# Defaults to lookup('manila_backend_isilon_enabled', undef, undef, false)
#
# [*backend_unity_enabled*]
# (Optional) Whether or not the unity backend is enabled
# Defaults to hiera('manila_backend_unity_enabled', false)
# Defaults to lookup('manila_backend_unity_enabled', undef, undef, false)
#
# [*backend_vnx_enabled*]
# (Optional) Whether or not the vnx backend is enabled
# Defaults to hiera('manila_backend_vnx_enabled', false)
# Defaults to lookup('manila_backend_vnx_enabled', undef, undef, false)
#
# [*backend_flashblade_enabled*]
# (Optional) Whether or not the flashblade backend is enabled
# Defaults to hiera('manila_backend_flashblade_enabled', false)
# Defaults to lookup('manila_backend_flashblade_enabled', undef, undef, false)
#
# [*backend_cephfs_enabled*]
# (Optional) Whether or not the cephfs backend is enabled
# Defaults to hiera('manila_backend_cephfs_enabled', false)
# Defaults to lookup('manila_backend_cephfs_enabled', undef, undef, false)
#
# [*manila_user_enabled_backends*]
# (Optional) List of additional backend stanzas to activate
# Defaults to hiera('manila_user_enabled_backends', undef)
# Defaults to lookup('manila_user_enabled_backends', undef, undef, undef)
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
class tripleo::profile::base::manila::share (
$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_powermax_enabled = hiera('manila_backend_powermax_enabled', false),
$backend_isilon_enabled = hiera('manila_backend_isilon_enabled', false),
$backend_unity_enabled = hiera('manila_backend_unity_enabled', false),
$backend_vnx_enabled = hiera('manila_backend_vnx_enabled', false),
$backend_flashblade_enabled = hiera('manila_backend_flashblade_enabled', false),
$backend_cephfs_enabled = hiera('manila_backend_cephfs_enabled', false),
$manila_user_enabled_backends = hiera('manila_user_enabled_backends', undef),
$step = Integer(hiera('step')),
$backend_generic_enabled = lookup('manila_backend_generic_enabled', undef, undef, false),
$backend_netapp_enabled = lookup('manila_backend_netapp_enabled', undef, undef, false),
$backend_vmax_enabled = lookup('manila_backend_vmax_enabled', undef, undef, false),
$backend_powermax_enabled = lookup('manila_backend_powermax_enabled', undef, undef, false),
$backend_isilon_enabled = lookup('manila_backend_isilon_enabled', undef, undef, false),
$backend_unity_enabled = lookup('manila_backend_unity_enabled', undef, undef, false),
$backend_vnx_enabled = lookup('manila_backend_vnx_enabled', undef, undef, false),
$backend_flashblade_enabled = lookup('manila_backend_flashblade_enabled', undef, undef, false),
$backend_cephfs_enabled = lookup('manila_backend_cephfs_enabled', undef, undef, false),
$manila_user_enabled_backends = lookup('manila_user_enabled_backends', undef, undef, undef),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::manila
@ -83,24 +83,24 @@ class tripleo::profile::base::manila::share (
# manila generic:
if $backend_generic_enabled {
$manila_generic_backend = hiera('manila::backend::generic::title')
$manila_generic_backend = lookup('manila::backend::generic::title')
create_resources('manila::backend::generic', { $manila_generic_backend => delete_undef_values({
'driver_handles_share_servers' => hiera('manila::backend::generic::driver_handles_share_servers', true),
'backend_availability_zone' => hiera('manila::backend::generic::backend_availability_zone', undef),
'max_time_to_attach' => hiera('manila::backend::generic::max_time_to_attach', undef),
'max_time_to_create_volume' => hiera('manila::backend::generic::max_time_to_create_volume', undef),
'service_instance_smb_config_path' => hiera('manila::backend::generic::service_instance_smb_config_path', undef),
'share_mount_path' => hiera('manila::backend::generic::share_mount_path', undef),
'share_volume_fstype' => hiera('manila::backend::generic::share_volume_fstype', undef),
'smb_template_config_path' => hiera('manila::backend::generic::smb_template_config_path', undef),
'volume_name_template' => hiera('manila::backend::generic::volume_name_template', undef),
'volume_snapshot_name_template' => hiera('manila::backend::generic::volume_snapshot_name_template', undef),
'cinder_volume_type' => hiera('manila::backend::generic::cinder_volume_type', undef),
'driver_handles_share_servers' => lookup('manila::backend::generic::driver_handles_share_servers', undef, undef, true),
'backend_availability_zone' => lookup('manila::backend::generic::backend_availability_zone', undef, undef, undef),
'max_time_to_attach' => lookup('manila::backend::generic::max_time_to_attach', undef, undef, undef),
'max_time_to_create_volume' => lookup('manila::backend::generic::max_time_to_create_volume', undef, undef, undef),
'service_instance_smb_config_path' => lookup('manila::backend::generic::service_instance_smb_config_path', undef, undef, undef),
'share_mount_path' => lookup('manila::backend::generic::share_mount_path', undef, undef, undef),
'share_volume_fstype' => lookup('manila::backend::generic::share_volume_fstype', undef, undef, undef),
'smb_template_config_path' => lookup('manila::backend::generic::smb_template_config_path', undef, undef, undef),
'volume_name_template' => lookup('manila::backend::generic::volume_name_template', undef, undef, undef),
'volume_snapshot_name_template' => lookup('manila::backend::generic::volume_snapshot_name_template', undef, undef, undef),
'cinder_volume_type' => lookup('manila::backend::generic::cinder_volume_type', undef, undef, undef),
})})
$service_instance_user = hiera('manila::service_instance::service_instance_user')
$service_instance_password = hiera('manila::service_instance::service_instance_password')
$service_instance_flavor_id = hiera('manila::service_instance::service_instance_flavor_id')
$service_instance_user = lookup('manila::service_instance::service_instance_user')
$service_instance_password = lookup('manila::service_instance::service_instance_password')
$service_instance_flavor_id = lookup('manila::service_instance::service_instance_flavor_id')
manila_config {
"${manila_generic_backend}/service_instance_user": value => $service_instance_user;
"${manila_generic_backend}/service_instance_password": value => $service_instance_password;
@ -112,33 +112,33 @@ class tripleo::profile::base::manila::share (
# manila cephfs:
if $backend_cephfs_enabled {
$manila_cephfs_backend = hiera('manila::backend::cephfs::title')
$cephfs_auth_id = hiera('manila::backend::cephfs::cephfs_auth_id')
$cephfs_ganesha_server_ip = hiera('manila::backend::cephfs::cephfs_ganesha_server_ip', undef)
$manila_cephfs_protocol_helper_type = hiera('manila::backend::cephfs::cephfs_protocol_helper_type', false)
$manila_cephfs_pool_name = hiera('manila::backend::cephfs::pool_name', 'manila_data')
$manila_cephfs_ceph_conf_path = hiera('manila_cephfs_ceph_conf_path', '/etc/ceph')
$manila_cephfs_backend = lookup('manila::backend::cephfs::title')
$cephfs_auth_id = lookup('manila::backend::cephfs::cephfs_auth_id')
$cephfs_ganesha_server_ip = lookup('manila::backend::cephfs::cephfs_ganesha_server_ip', undef, undef, undef)
$manila_cephfs_protocol_helper_type = lookup('manila::backend::cephfs::cephfs_protocol_helper_type', undef, undef, false)
$manila_cephfs_pool_name = lookup('manila::backend::cephfs::pool_name', undef, undef, 'manila_data')
$manila_cephfs_ceph_conf_path = lookup('manila_cephfs_ceph_conf_path', undef, undef, '/etc/ceph')
if $cephfs_ganesha_server_ip == undef {
$cephfs_ganesha_server_ip_real = hiera('ganesha_vip', undef)
$cephfs_ganesha_server_ip_real = lookup('ganesha_vip', undef, undef, undef)
} else {
$cephfs_ganesha_server_ip_real = $cephfs_ganesha_server_ip
}
create_resources('manila::backend::cephfs', { $manila_cephfs_backend => delete_undef_values({
'driver_handles_share_servers' => hiera('manila::backend::cephfs::driver_handles_share_servers', false),
'backend_availability_zone' => hiera('manila::backend::cephfs::backend_availability_zone', undef),
'share_backend_name' => hiera('manila::backend::cephfs::share_backend_name', undef),
'cephfs_conf_path' => hiera('manila::backend::cephfs::cephfs_conf_path', undef),
'driver_handles_share_servers' => lookup('manila::backend::cephfs::driver_handles_share_servers', undef, undef, false),
'backend_availability_zone' => lookup('manila::backend::cephfs::backend_availability_zone', undef, undef, undef),
'share_backend_name' => lookup('manila::backend::cephfs::share_backend_name', undef, undef, undef),
'cephfs_conf_path' => lookup('manila::backend::cephfs::cephfs_conf_path', undef, undef, undef),
'cephfs_auth_id' => $cephfs_auth_id,
'cephfs_cluster_name' => hiera('manila::backend::cephfs::cephfs_cluster_name', undef),
'cephfs_volume_mode' => hiera('manila::backend::cephfs::cephfs_volume_mode', '0755'),
'cephfs_cluster_name' => lookup('manila::backend::cephfs::cephfs_cluster_name', undef, undef, undef),
'cephfs_volume_mode' => lookup('manila::backend::cephfs::cephfs_volume_mode', undef, undef, '0755'),
'cephfs_protocol_helper_type' => $manila_cephfs_protocol_helper_type,
'cephfs_ganesha_server_ip' => $cephfs_ganesha_server_ip_real,
'cephfs_ganesha_server_is_remote' => hiera('manila::backend::cephfs::cephfs_ganesha_server_is_remote', false),
'cephfs_ganesha_server_username' => hiera('manila::backend::cephfs::cephfs_ganesha_server_username', undef),
'cephfs_ganesha_server_password' => hiera('manila::backend::cephfs::cephfs_ganesha_server_password', undef),
'cephfs_ganesha_path_to_private_key' => hiera('manila::backend::cephfs::cephfs_ganesha_path_to_private_key', undef),
'cephfs_ganesha_server_is_remote' => lookup('manila::backend::cephfs::cephfs_ganesha_server_is_remote', undef, undef, false),
'cephfs_ganesha_server_username' => lookup('manila::backend::cephfs::cephfs_ganesha_server_username', undef, undef, undef),
'cephfs_ganesha_server_password' => lookup('manila::backend::cephfs::cephfs_ganesha_server_password', undef, undef, undef),
'cephfs_ganesha_path_to_private_key' => lookup('manila::backend::cephfs::cephfs_ganesha_path_to_private_key', undef, undef, undef),
})})
# cephfs supports both direct cephfs access or access through
@ -166,122 +166,123 @@ class tripleo::profile::base::manila::share (
# manila netapp:
if $backend_netapp_enabled {
$manila_netapp_backend = hiera('manila::backend::netapp::title')
$manila_netapp_backend = lookup('manila::backend::netapp::title')
create_resources('manila::backend::netapp', { $manila_netapp_backend => delete_undef_values({
'driver_handles_share_servers' => hiera('manila::backend::netapp::driver_handles_share_servers', true),
'backend_availability_zone' => hiera('manila::backend::netapp::backend_availability_zone', undef),
'netapp_login' => hiera('manila::backend::netapp::netapp_login', undef),
'netapp_password' => hiera('manila::backend::netapp::netapp_password', undef),
'netapp_server_hostname' => hiera('manila::backend::netapp::netapp_server_hostname', undef),
'netapp_transport_type' => hiera('manila::backend::netapp::netapp_transport_type', undef),
'netapp_storage_family' => hiera('manila::backend::netapp::netapp_storage_family', undef),
'netapp_server_port' => hiera('manila::backend::netapp::netapp_server_port', undef),
'netapp_volume_name_template' => hiera('manila::backend::netapp::netapp_volume_name_template', undef),
'netapp_vserver' => hiera('manila::backend::netapp::netapp_vserver', undef),
'netapp_vserver_name_template' => hiera('manila::backend::netapp::netapp_vserver_name_template', undef),
'netapp_lif_name_template' => hiera('manila::backend::netapp::netapp_lif_name_template', undef),
'netapp_aggregate_name_search_pattern' => hiera('manila::backend::netapp::netapp_aggregate_name_search_pattern', undef),
'netapp_root_volume_aggregate' => hiera('manila::backend::netapp::netapp_root_volume_aggregate', undef),
'netapp_root_volume' => hiera('manila::backend::netapp::netapp_root_volume', undef),
'netapp_port_name_search_pattern' => hiera('manila::backend::netapp::netapp_port_name_search_pattern', undef),
'netapp_trace_flags' => hiera('manila::backend::netapp::netapp_trace_flags', undef),
'driver_handles_share_servers' => lookup('manila::backend::netapp::driver_handles_share_servers', undef, undef, true),
'backend_availability_zone' => lookup('manila::backend::netapp::backend_availability_zone', undef, undef, undef),
'netapp_login' => lookup('manila::backend::netapp::netapp_login', undef, undef, undef),
'netapp_password' => lookup('manila::backend::netapp::netapp_password', undef, undef, undef),
'netapp_server_hostname' => lookup('manila::backend::netapp::netapp_server_hostname', undef, undef, undef),
'netapp_transport_type' => lookup('manila::backend::netapp::netapp_transport_type', undef, undef, undef),
'netapp_storage_family' => lookup('manila::backend::netapp::netapp_storage_family', undef, undef, undef),
'netapp_server_port' => lookup('manila::backend::netapp::netapp_server_port', undef, undef, undef),
'netapp_volume_name_template' => lookup('manila::backend::netapp::netapp_volume_name_template', undef, undef, undef),
'netapp_vserver' => lookup('manila::backend::netapp::netapp_vserver', undef, undef, undef),
'netapp_vserver_name_template' => lookup('manila::backend::netapp::netapp_vserver_name_template', undef, undef, undef),
'netapp_lif_name_template' => lookup('manila::backend::netapp::netapp_lif_name_template', undef, undef, undef),
'netapp_aggregate_name_search_pattern' => lookup('manila::backend::netapp::netapp_aggregate_name_search_pattern',
undef, undef, undef),
'netapp_root_volume_aggregate' => lookup('manila::backend::netapp::netapp_root_volume_aggregate', undef, undef, undef),
'netapp_root_volume' => lookup('manila::backend::netapp::netapp_root_volume', undef, undef, undef),
'netapp_port_name_search_pattern' => lookup('manila::backend::netapp::netapp_port_name_search_pattern', undef, undef, undef),
'netapp_trace_flags' => lookup('manila::backend::netapp::netapp_trace_flags', undef, undef, undef),
})})
}
# manila vmax:
if $backend_vmax_enabled {
$manila_vmax_backend = hiera('manila::backend::dellemc_vmax::title')
$manila_vmax_backend = lookup('manila::backend::dellemc_vmax::title')
create_resources('manila::backend::dellemc_vmax', { $manila_vmax_backend => delete_undef_values({
'backend_availability_zone' => hiera('manila::backend::dellemc_vmax::backend_availability_zone', undef),
'emc_nas_login' => hiera('manila::backend::dellemc_vmax::emc_nas_login', undef),
'emc_nas_password' => hiera('manila::backend::dellemc_vmax::emc_nas_password', undef),
'emc_nas_server' => hiera('manila::backend::dellemc_vmax::emc_nas_server', undef),
'emc_share_backend' => hiera('manila::backend::dellemc_vmax::emc_share_backend','vmax'),
'vmax_server_container' => hiera('manila::backend::dellemc_vmax::vmax_server_container', undef),
'vmax_share_data_pools' => hiera('manila::backend::dellemc_vmax::vmax_share_data_pools', undef),
'vmax_ethernet_ports' => hiera('manila::backend::dellemc_vmax::vmax_ethernet_ports', undef),
'backend_availability_zone' => lookup('manila::backend::dellemc_vmax::backend_availability_zone', undef, undef, undef),
'emc_nas_login' => lookup('manila::backend::dellemc_vmax::emc_nas_login', undef, undef, undef),
'emc_nas_password' => lookup('manila::backend::dellemc_vmax::emc_nas_password', undef, undef, undef),
'emc_nas_server' => lookup('manila::backend::dellemc_vmax::emc_nas_server', undef, undef, undef),
'emc_share_backend' => lookup('manila::backend::dellemc_vmax::emc_share_backend', undef, undef, 'vmax'),
'vmax_server_container' => lookup('manila::backend::dellemc_vmax::vmax_server_container', undef, undef, undef),
'vmax_share_data_pools' => lookup('manila::backend::dellemc_vmax::vmax_share_data_pools', undef, undef, undef),
'vmax_ethernet_ports' => lookup('manila::backend::dellemc_vmax::vmax_ethernet_ports', undef, undef, undef),
})})
}
# manila powermax:
if $backend_powermax_enabled {
$manila_powermax_backend = hiera('manila::backend::dellemc_powermax::title')
$manila_powermax_backend = lookup('manila::backend::dellemc_powermax::title')
create_resources('manila::backend::dellemc_powermax', { $manila_powermax_backend => delete_undef_values({
'backend_availability_zone' => hiera('manila::backend::dellemc_powermax::backend_availability_zone', undef),
'emc_nas_login' => hiera('manila::backend::dellemc_powermax::emc_nas_login', undef),
'emc_nas_password' => hiera('manila::backend::dellemc_powermax::emc_nas_password', undef),
'emc_nas_server' => hiera('manila::backend::dellemc_powermax::emc_nas_server', undef),
'emc_share_backend' => hiera('manila::backend::dellemc_powermax::emc_share_backend','powermax'),
'emc_ssl_cert_verify' => hiera('manila::backend::dellemc_powermax::emc_ssl_cert_verify', false),
'emc_nas_server_secure' => hiera('manila::backend::dellemc_powermax::emc_nas_server_secure', false),
'emc_ssl_cert_path' => hiera('manila::backend::dellemc_powermax::emc_ssl_cert_path', undef),
'powermax_server_container' => hiera('manila::backend::dellemc_powermax::powermax_server_container', undef),
'powermax_share_data_pools' => hiera('manila::backend::dellemc_powermax::powermax_share_data_pools', undef),
'powermax_ethernet_ports' => hiera('manila::backend::dellemc_powermax::powermax_ethernet_ports', undef),
'backend_availability_zone' => lookup('manila::backend::dellemc_powermax::backend_availability_zone', undef, undef, undef),
'emc_nas_login' => lookup('manila::backend::dellemc_powermax::emc_nas_login', undef, undef, undef),
'emc_nas_password' => lookup('manila::backend::dellemc_powermax::emc_nas_password', undef, undef, undef),
'emc_nas_server' => lookup('manila::backend::dellemc_powermax::emc_nas_server', undef, undef, undef),
'emc_share_backend' => lookup('manila::backend::dellemc_powermax::emc_share_backend', undef, undef, 'powermax'),
'emc_ssl_cert_verify' => lookup('manila::backend::dellemc_powermax::emc_ssl_cert_verify', undef, undef, false),
'emc_nas_server_secure' => lookup('manila::backend::dellemc_powermax::emc_nas_server_secure', undef, undef, false),
'emc_ssl_cert_path' => lookup('manila::backend::dellemc_powermax::emc_ssl_cert_path', undef, undef, undef),
'powermax_server_container' => lookup('manila::backend::dellemc_powermax::powermax_server_container', undef, undef, undef),
'powermax_share_data_pools' => lookup('manila::backend::dellemc_powermax::powermax_share_data_pools', undef, undef, undef),
'powermax_ethernet_ports' => lookup('manila::backend::dellemc_powermax::powermax_ethernet_ports', undef, undef, undef),
})})
}
# manila unity:
if $backend_unity_enabled {
$manila_unity_backend = hiera('manila::backend::dellemc_unity::title')
$manila_unity_backend = lookup('manila::backend::dellemc_unity::title')
create_resources('manila::backend::dellemc_unity', { $manila_unity_backend => delete_undef_values({
'driver_handles_share_servers' => hiera('manila::backend::dellemc_unity::driver_handles_share_servers', true),
'backend_availability_zone' => hiera('manila::backend::dellemc_unity::backend_availability_zone', undef),
'emc_nas_login' => hiera('manila::backend::dellemc_unity::emc_nas_login', undef),
'emc_nas_password' => hiera('manila::backend::dellemc_unity::emc_nas_password', undef),
'emc_nas_server' => hiera('manila::backend::dellemc_unity::emc_nas_server', undef),
'emc_share_backend' => hiera('manila::backend::dellemc_unity::emc_share_backend', 'unity'),
'unity_server_meta_pool' => hiera('manila::backend::dellemc_unity::unity_server_meta_pool', undef),
'unity_share_data_pools' => hiera('manila::backend::dellemc_unity::unity_share_data_pools', undef),
'unity_ethernet_ports' => hiera('manila::backend::dellemc_unity::unity_ethernet_ports', undef),
'network_plugin_ipv6_enabled' => hiera('manila::backend::dellemc_unity::network_plugin_ipv6_enabled', undef),
'emc_ssl_cert_verify' => hiera('manila::backend::dellemc_unity::emc_ssl_cert_verify', undef),
'emc_ssl_cert_path' => hiera('manila::backend::dellemc_unity::emc_ssl_cert_path', undef),
'driver_handles_share_servers' => lookup('manila::backend::dellemc_unity::driver_handles_share_servers', undef, undef, true),
'backend_availability_zone' => lookup('manila::backend::dellemc_unity::backend_availability_zone', undef, undef, undef),
'emc_nas_login' => lookup('manila::backend::dellemc_unity::emc_nas_login', undef, undef, undef),
'emc_nas_password' => lookup('manila::backend::dellemc_unity::emc_nas_password', undef, undef, undef),
'emc_nas_server' => lookup('manila::backend::dellemc_unity::emc_nas_server', undef, undef, undef),
'emc_share_backend' => lookup('manila::backend::dellemc_unity::emc_share_backend', undef, undef, 'unity'),
'unity_server_meta_pool' => lookup('manila::backend::dellemc_unity::unity_server_meta_pool', undef, undef, undef),
'unity_share_data_pools' => lookup('manila::backend::dellemc_unity::unity_share_data_pools', undef, undef, undef),
'unity_ethernet_ports' => lookup('manila::backend::dellemc_unity::unity_ethernet_ports', undef, undef, undef),
'network_plugin_ipv6_enabled' => lookup('manila::backend::dellemc_unity::network_plugin_ipv6_enabled', undef, undef, undef),
'emc_ssl_cert_verify' => lookup('manila::backend::dellemc_unity::emc_ssl_cert_verify', undef, undef, undef),
'emc_ssl_cert_path' => lookup('manila::backend::dellemc_unity::emc_ssl_cert_path', undef, undef, undef),
})})
}
# manila vnx:
if $backend_vnx_enabled {
$manila_vnx_backend = hiera('manila::backend::dellemc_vnx::title')
$manila_vnx_backend = lookup('manila::backend::dellemc_vnx::title')
create_resources('manila::backend::dellemc_vnx', { $manila_vnx_backend => delete_undef_values({
'backend_availability_zone' => hiera('manila::backend::dellemc_vnx::backend_availability_zone', undef),
'emc_nas_login' => hiera('manila::backend::dellemc_vnx::emc_nas_login', undef),
'emc_nas_password' => hiera('manila::backend::dellemc_vnx::emc_nas_password', undef),
'emc_nas_server' => hiera('manila::backend::dellemc_vnx::emc_nas_server', undef),
'emc_share_backend' => hiera('manila::backend::dellemc_vnx::emc_share_backend','vnx'),
'vnx_server_container' => hiera('manila::backend::dellemc_vnx::vnx_server_container', undef),
'vnx_share_data_pools' => hiera('manila::backend::dellemc_vnx::vnx_share_data_pools', undef),
'vnx_ethernet_ports' => hiera('manila::backend::dellemc_vnx::vnx_ethernet_ports', undef),
'network_plugin_ipv6_enabled' => hiera('manila::backend::dellemc_vnx::network_plugin_ipv6_enabled', undef),
'emc_ssl_cert_verify' => hiera('manila::backend::dellemc_vnx::emc_ssl_cert_verify', undef),
'emc_ssl_cert_path' => hiera('manila::backend::dellemc_vnx::emc_ssl_cert_path', undef),
'backend_availability_zone' => lookup('manila::backend::dellemc_vnx::backend_availability_zone', undef, undef, undef),
'emc_nas_login' => lookup('manila::backend::dellemc_vnx::emc_nas_login', undef, undef, undef),
'emc_nas_password' => lookup('manila::backend::dellemc_vnx::emc_nas_password', undef, undef, undef),
'emc_nas_server' => lookup('manila::backend::dellemc_vnx::emc_nas_server', undef, undef, undef),
'emc_share_backend' => lookup('manila::backend::dellemc_vnx::emc_share_backend', undef, undef, 'vnx'),
'vnx_server_container' => lookup('manila::backend::dellemc_vnx::vnx_server_container', undef, undef, undef),
'vnx_share_data_pools' => lookup('manila::backend::dellemc_vnx::vnx_share_data_pools', undef, undef, undef),
'vnx_ethernet_ports' => lookup('manila::backend::dellemc_vnx::vnx_ethernet_ports', undef, undef, undef),
'network_plugin_ipv6_enabled' => lookup('manila::backend::dellemc_vnx::network_plugin_ipv6_enabled', undef, undef, undef),
'emc_ssl_cert_verify' => lookup('manila::backend::dellemc_vnx::emc_ssl_cert_verify', undef, undef, undef),
'emc_ssl_cert_path' => lookup('manila::backend::dellemc_vnx::emc_ssl_cert_path', undef, undef, undef),
})})
}
# manila isilon:
if $backend_isilon_enabled {
$manila_isilon_backend = hiera('manila::backend::dellemc_isilon::title')
$manila_isilon_backend = lookup('manila::backend::dellemc_isilon::title')
create_resources('manila::backend::dellemc_isilon', { $manila_isilon_backend => delete_undef_values({
'backend_availability_zone' => hiera('manila::backend::dellemc_isilon::backend_availability_zone', undef),
'emc_nas_login' => hiera('manila::backend::dellemc_isilon::emc_nas_login', undef),
'emc_nas_password' => hiera('manila::backend::dellemc_isilon::emc_nas_password', undef),
'emc_nas_server' => hiera('manila::backend::dellemc_isilon::emc_nas_server', undef),
'emc_share_backend' => hiera('manila::backend::dellemc_isilon::emc_share_backend','isilon'),
'emc_nas_root_dir' => hiera('manila::backend::dellemc_isilon::emc_nas_root_dir', undef),
'emc_nas_server_port' => hiera('manila::backend::dellemc_isilon::emc_server_port', undef),
'emc_nas_server_secure' => hiera('manila::backend::dellemc_isilon::emc_nas_secure', undef),
'backend_availability_zone' => lookup('manila::backend::dellemc_isilon::backend_availability_zone', undef, undef, undef),
'emc_nas_login' => lookup('manila::backend::dellemc_isilon::emc_nas_login', undef, undef, undef),
'emc_nas_password' => lookup('manila::backend::dellemc_isilon::emc_nas_password', undef, undef, undef),
'emc_nas_server' => lookup('manila::backend::dellemc_isilon::emc_nas_server', undef, undef, undef),
'emc_share_backend' => lookup('manila::backend::dellemc_isilon::emc_share_backend', undef, undef, 'isilon'),
'emc_nas_root_dir' => lookup('manila::backend::dellemc_isilon::emc_nas_root_dir', undef, undef, undef),
'emc_nas_server_port' => lookup('manila::backend::dellemc_isilon::emc_server_port', undef, undef, undef),
'emc_nas_server_secure' => lookup('manila::backend::dellemc_isilon::emc_nas_secure', undef, undef, undef),
})})
}
# manila flashblade:
if $backend_flashblade_enabled {
$manila_flashblade_backend = hiera('manila::backend::flashblade::title')
$manila_flashblade_backend = lookup('manila::backend::flashblade::title')
create_resources('manila::backend::flashblade', { $manila_flashblade_backend => delete_undef_values({
'flashblade_mgmt_vip' => hiera('manila::backend::flashblade::flashblade_mgmt_vip', undef),
'backend_availability_zone' => hiera('manila::backend::flashblade::backend_availability_zone', undef),
'flashblade_data_vip' => hiera('manila::backend::flashblade::flashblade_data_vip', undef),
'flashblade_api_token' => hiera('manila::backend::flashblade::flashblade_api_token', undef),
'flashblade_eradicate' => hiera('manila::backend::flashblade::flashblade_eradicate', undef),
'flashblade_mgmt_vip' => lookup('manila::backend::flashblade::flashblade_mgmt_vip', undef, undef, undef),
'backend_availability_zone' => lookup('manila::backend::flashblade::backend_availability_zone', undef, undef, undef),
'flashblade_data_vip' => lookup('manila::backend::flashblade::flashblade_data_vip', undef, undef, undef),
'flashblade_api_token' => lookup('manila::backend::flashblade::flashblade_api_token', undef, undef, undef),
'flashblade_eradicate' => lookup('manila::backend::flashblade::flashblade_eradicate', undef, undef, undef),
})})
}