openstack
/
puppet-tripleo
Code Issues Proposed changes

Cinder: 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: I77cb622a7ec1471715bb3e4fcb0157e5a6b80e74
This commit is contained in:
katarimanoj 2022-04-19 15:46:42 +05:30 committed by Takashi Kajinami
parent 44cce1747f
commit 626535352d
25 changed files with 324 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('cinder_api_short_bootstrap_node_name')
# Defaults to lookup('cinder_api_short_bootstrap_node_name', undef, undef, undef)
#
# [*cinder_enable_db_purge*]
# (Optional) Wheter to enable db purging
@ -28,72 +28,72 @@
#
# [*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::cinder (
$bootstrap_node = hiera('cinder_api_short_bootstrap_node_name', undef),
$bootstrap_node = lookup('cinder_api_short_bootstrap_node_name', undef, undef, undef),
$cinder_enable_db_purge = true,
$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'),
$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

20
manifests/profile/base/cinder/api.pp
View File

@ -20,7 +20,7 @@
#
# [*bootstrap_node*]
# (Optional) The hostname of the node responsible for bootstrapping tasks
# Defaults to hiera('cinder_api_short_bootstrap_node_name')
# Defaults to lookup('cinder_api_short_bootstrap_node_name', undef, undef, undef)
#
# [*certificates_specs*]
# (Optional) The specifications to give to certmonger for the certificate(s)
@ -32,28 +32,28 @@
# 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, {}).
#
# [*cinder_api_network*]
# (Optional) The network name where the cinder API endpoint is listening on.
# This is set by t-h-t.
# Defaults to hiera('cinder_api_network', undef)
# Defaults to lookup('cinder_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'))
#
class tripleo::profile::base::cinder::api (
$bootstrap_node = hiera('cinder_api_short_bootstrap_node_name', undef),
$certificates_specs = hiera('apache_certificates_specs', {}),
$cinder_api_network = hiera('cinder_api_network', undef),
$enable_internal_tls = hiera('enable_internal_tls', false),
$step = Integer(hiera('step')),
$bootstrap_node = lookup('cinder_api_short_bootstrap_node_name', undef, undef, undef),
$certificates_specs = lookup('apache_certificates_specs', undef, undef, {}),
$cinder_api_network = lookup('cinder_api_network', undef, undef, undef),
$enable_internal_tls = lookup('enable_internal_tls', undef, undef, false),
$step = Integer(lookup('step')),
) {
if $bootstrap_node and $::hostname == downcase($bootstrap_node) {

24
manifests/profile/base/cinder/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::cinder::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/cinder/backup.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::cinder::backup (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder

4
manifests/profile/base/cinder/backup/ceph.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::cinder::backup::ceph (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::backup

4
manifests/profile/base/cinder/backup/gcs.pp
View File

@ -29,12 +29,12 @@
# [*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::cinder::backup::gcs (
$credentials,
$credential_file = '/etc/cinder/gcs-backup.json',
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::backup

4
manifests/profile/base/cinder/backup/nfs.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::cinder::backup::nfs (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::backup

4
manifests/profile/base/cinder/backup/s3.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::cinder::backup::s3 (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::backup

4
manifests/profile/base/cinder/backup/swift.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::cinder::backup::swift (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::backup

4
manifests/profile/base/cinder/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::cinder::scheduler (
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder

71
manifests/profile/base/cinder/volume.pp
View File

@ -76,7 +76,7 @@
#
# [*cinder_user_enabled_backends*]
# (Optional) List of additional backend stanzas to activate
# Defaults to hiera('cinder_user_enabled_backends')
# Defaults to lookup('cinder_user_enabled_backends', undef, undef, undef)
#
# [*cinder_volume_cluster*]
# (Optional) Name of the cluster when running in active-active mode
@ -84,28 +84,28 @@
#
# [*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)
#
# [*etcd_certificate_specs*]
# (optional) TLS certificate specs for the etcd service
# Defaults to hiera('tripleo::profile::base::etcd::certificate_specs', {})
# Defaults to lookup('tripleo::profile::base::etcd::certificate_specs', undef, undef, {})
#
# [*etcd_enabled*]
# (optional) Whether the etcd service is enabled or not
# Defaults to hiera('etcd_enabled', false)
# Defaults to lookup('etcd_enabled', undef, undef, false)
#
# [*etcd_host*]
# (optional) IP address (VIP) of the etcd service
# Defaults to hiera('etcd_vip', undef)
# Defaults to lookup('etcd_vip', undef, undef, undef)
#
# [*etcd_port*]
# (optional) Port used by the etcd service
# Defaults to hiera('tripleo::profile::base::etcd::client_port', '2379')
# Defaults to lookup('tripleo::profile::base::etcd::client_port', undef, undef, '2379')
#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
# Defaults to Integer(lookup('step'))
#
# DEPRECATED PARAMETERS
#
@ -132,14 +132,14 @@ class tripleo::profile::base::cinder::volume (
$cinder_enable_nfs_backend = false,
$cinder_enable_rbd_backend = false,
$cinder_enable_nvmeof_backend = false,
$cinder_user_enabled_backends = hiera('cinder_user_enabled_backends', undef),
$cinder_user_enabled_backends = lookup('cinder_user_enabled_backends', undef, undef, undef),
$cinder_volume_cluster = '',
$enable_internal_tls = hiera('enable_internal_tls', false),
$etcd_certificate_specs = hiera('tripleo::profile::base::etcd::certificate_specs', {}),
$etcd_enabled = hiera('etcd_enabled', false),
$etcd_host = hiera('etcd_vip', undef),
$etcd_port = hiera('tripleo::profile::base::etcd::client_port', '2379'),
$step = Integer(hiera('step')),
$enable_internal_tls = lookup('enable_internal_tls', undef, undef, false),
$etcd_certificate_specs = lookup('tripleo::profile::base::etcd::certificate_specs', undef, undef, {}),
$etcd_enabled = lookup('etcd_enabled', undef, undef, false),
$etcd_host = lookup('etcd_vip', undef, undef, undef),
$etcd_port = lookup('tripleo::profile::base::etcd::client_port', undef, undef, '2379'),
$step = Integer(lookup('step')),
# DEPRECATED PARAMETERS
$cinder_rbd_ceph_conf_path = undef,
$cinder_rbd_client_name = undef,
@ -181,97 +181,100 @@ class tripleo::profile::base::cinder::volume (
if $cinder_enable_pure_backend {
include tripleo::profile::base::cinder::volume::pure
$cinder_pure_backend_name = hiera('cinder::backend::pure::volume_backend_name', 'tripleo_pure')
$cinder_pure_backend_name = lookup('cinder::backend::pure::volume_backend_name', undef, undef, 'tripleo_pure')
} else {
$cinder_pure_backend_name = undef
}
if $cinder_enable_dellsc_backend {
include tripleo::profile::base::cinder::volume::dellsc
$cinder_dellsc_backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc')
$cinder_dellsc_backend_name = lookup('cinder::backend::dellsc_iscsi::volume_backend_name', undef, undef, 'tripleo_dellsc')
} else {
$cinder_dellsc_backend_name = undef
}
if $cinder_enable_dellemc_sc_backend {
include tripleo::profile::base::cinder::volume::dellemc_sc
$cinder_dellemc_sc_backend_name = hiera('cinder::backend::dellemc_sc::volume_backend_name', 'tripleo_dellemc_sc')
$cinder_dellemc_sc_backend_name = lookup('cinder::backend::dellemc_sc::volume_backend_name', undef, undef, 'tripleo_dellemc_sc')
} else {
$cinder_dellemc_sc_backend_name = undef
}
if $cinder_enable_dellemc_unity_backend {
include tripleo::profile::base::cinder::volume::dellemc_unity
$cinder_dellemc_unity_backend_name = hiera('cinder::backend::dellemc_unity::volume_backend_name', 'tripleo_dellemc_unity')
$cinder_dellemc_unity_backend_name = lookup('cinder::backend::dellemc_unity::volume_backend_name',
undef, undef, 'tripleo_dellemc_unity')
} else {
$cinder_dellemc_unity_backend_name = undef
}
if $cinder_enable_dellemc_powerflex_backend {
include tripleo::profile::base::cinder::volume::dellemc_powerflex
$cinder_dellemc_powerflex_backend_name = hiera('cinder::backend::dellemc_powerflex::volume_backend_name', 'tripleo_dellemc_powerflex')
$cinder_dellemc_powerflex_backend_name = lookup('cinder::backend::dellemc_powerflex::volume_backend_name',
undef, undef, 'tripleo_dellemc_powerflex')
} else {
$cinder_dellemc_powerflex_backend_name = undef
}
if $cinder_enable_dellemc_powermax_backend {
include tripleo::profile::base::cinder::volume::dellemc_powermax
$cinder_dellemc_powermax_backend_name = hiera('cinder::backend::dellemc_powermax::volume_backend_name', 'tripleo_dellemc_powermax')
$cinder_dellemc_powermax_backend_name = lookup('cinder::backend::dellemc_powermax::volume_backend_name',
undef, undef, 'tripleo_dellemc_powermax')
} else {
$cinder_dellemc_powermax_backend_name = undef
}
if $cinder_enable_dellemc_powerstore_backend {
include tripleo::profile::base::cinder::volume::dellemc_powerstore
$cinder_dellemc_powerstore_backend_name = hiera('cinder::backend::dellemc_powerstore::volume_backend_name',
'tripleo_dellemc_powerstore')
$cinder_dellemc_powerstore_backend_name = lookup('cinder::backend::dellemc_powerstore::volume_backend_name',
undef, undef, 'tripleo_dellemc_powerstore')
} else {
$cinder_dellemc_powerstore_backend_name = undef
}
if $cinder_enable_dellemc_vnx_backend {
include tripleo::profile::base::cinder::volume::dellemc_vnx
$cinder_dellemc_vnx_backend_name = hiera('cinder::backend::emc_vnx::volume_backend_name',
'tripleo_dellemc_vnx')
$cinder_dellemc_vnx_backend_name = lookup('cinder::backend::emc_vnx::volume_backend_name',
undef, undef, 'tripleo_dellemc_vnx')
} else {
$cinder_dellemc_vnx_backend_name = undef
}
if $cinder_enable_dellemc_xtremio_backend {
include tripleo::profile::base::cinder::volume::dellemc_xtremio
$cinder_dellemc_xtremio_backend_name = hiera('cinder::backend::dellemc_xtremio::volume_backend_name',
'tripleo_dellemc_xtremio')
$cinder_dellemc_xtremio_backend_name = lookup('cinder::backend::dellemc_xtremio::volume_backend_name',
undef, undef, 'tripleo_dellemc_xtremio')
} else {
$cinder_dellemc_xtremio_backend_name = undef
}
if $cinder_enable_iscsi_backend {
include tripleo::profile::base::cinder::volume::iscsi
$cinder_iscsi_backend_name = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi')
$cinder_iscsi_backend_name = lookup('cinder::backend::iscsi::volume_backend_name', undef, undef, 'tripleo_iscsi')
} else {
$cinder_iscsi_backend_name = undef
}
if $cinder_enable_netapp_backend {
include tripleo::profile::base::cinder::volume::netapp
$cinder_netapp_backend_name = hiera('cinder::backend::netapp::volume_backend_name', 'tripleo_netapp')
$cinder_netapp_backend_name = lookup('cinder::backend::netapp::volume_backend_name', undef, undef, 'tripleo_netapp')
} else {
$cinder_netapp_backend_name = undef
}
if $cinder_enable_nfs_backend {
include tripleo::profile::base::cinder::volume::nfs
$cinder_nfs_backend_name = hiera('cinder::backend::nfs::volume_backend_name', 'tripleo_nfs')
$cinder_nfs_backend_name = lookup('cinder::backend::nfs::volume_backend_name', undef, undef, 'tripleo_nfs')
} else {
$cinder_nfs_backend_name = undef
}
if $cinder_enable_rbd_backend {
include tripleo::profile::base::cinder::volume::rbd
$cinder_rbd_backend_name = hiera('tripleo::profile::base::cinder::volume::rbd::backend_name',
['tripleo_ceph'])
$cinder_rbd_backend_name = lookup('tripleo::profile::base::cinder::volume::rbd::backend_name',
undef, undef, ['tripleo_ceph'])
$extra_pools = hiera('tripleo::profile::base::cinder::volume::rbd::cinder_rbd_extra_pools', undef)
$extra_pools = lookup('tripleo::profile::base::cinder::volume::rbd::cinder_rbd_extra_pools', undef, undef, undef)
if empty($extra_pools) {
$extra_backend_names = []
} else {
@ -282,7 +285,7 @@ class tripleo::profile::base::cinder::volume (
# Each $multi_config backend can specify its own list of extra pools. The
# backend names are the $multi_config hash keys.
$multi_config = hiera('tripleo::profile::base::cinder::volume::rbd::multi_config', {})
$multi_config = lookup('tripleo::profile::base::cinder::volume::rbd::multi_config', undef, undef, {})
$extra_multiconfig_backend_names = $multi_config.map |$base_name, $backend_config| {
$backend_extra_pools = $backend_config['CinderRbdExtraPools']
any2array($backend_extra_pools).map |$pool_name| { "${base_name}_${pool_name}" }
@ -296,7 +299,7 @@ class tripleo::profile::base::cinder::volume (
if $cinder_enable_nvmeof_backend {
include tripleo::profile::base::cinder::volume::nvmeof
$cinder_nvmeof_backend_name = hiera('cinder::backend::nvmeof::volume_backend_name', 'tripleo_nvmeof')
$cinder_nvmeof_backend_name = lookup('cinder::backend::nvmeof::volume_backend_name', undef, undef, 'tripleo_nvmeof')
} else {
$cinder_nvmeof_backend_name = undef
}

51
manifests/profile/base/cinder/volume/dellemc_powerflex.pp
View File

@ -20,39 +20,46 @@
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_dellemc_powerflex'
# Defaults to lookup('cinder::backend::dellemc_powerflex::volume_backend_name', undef, undef, 'tripleo_dellemc_powerflex')
#
# [*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::cinder::volume::dellemc_powerflex (
$backend_name = hiera('cinder::backend::dellemc_powerflex::volume_backend_name', 'tripleo_dellemc_powerflex'),
$step = Integer(hiera('step')),
$backend_name = lookup('cinder::backend::dellemc_powerflex::volume_backend_name', undef, undef, 'tripleo_dellemc_powerflex'),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
create_resources('cinder::backend::dellemc_powerflex', { $backend_name => delete_undef_values({
'backend_availability_zone' => hiera('cinder::backend::dellemc_powerflex::backend_availability_zone', undef),
'san_login' => hiera('cinder::backend::dellemc_powerflex::san_login', undef),
'san_password' => hiera('cinder::backend::dellemc_powerflex::san_password', undef),
'san_ip' => hiera('cinder::backend::dellemc_powerflex::san_ip', undef),
'powerflex_storage_pools' => hiera('cinder::backend::dellemc_powerflex::powerflex_storage_pools', undef),
'powerflex_allow_migration_during_rebuild' => hiera('cinder::backend::dellemc_powerflex::powerflex_allow_migration_during_rebuild',
undef),
'powerflex_allow_non_padded_volumes' => hiera('cinder::backend::dellemc_powerflex::powerflex_allow_non_padded_volumes', undef),
'powerflex_max_over_subscription_ratio' => hiera('cinder::backend::dellemc_powerflex::powerflex_max_over_subscription_ratio',
undef),
'powerflex_rest_server_port' => hiera('cinder::backend::dellemc_powerflex::powerflex_rest_server_port', undef),
'powerflex_round_volume_capacity' => hiera('cinder::backend::dellemc_powerflex::powerflex_round_volume_capacity', undef),
'powerflex_server_api_version' => hiera('cinder::backend::dellemc_powerflex::powerflex_server_api_version', undef),
'powerflex_unmap_volume_before_deletion' => hiera('cinder::backend::dellemc_powerflex::powerflex_unmap_volume_before_deletion',
undef),
'san_thin_provision' => hiera('cinder::backend::dellemc_powerflex::san_thin_provision', undef),
'driver_ssl_cert_verify' => hiera('cinder::backend::dellemc_powerflex::driver_ssl_cert_verify', undef),
'driver_ssl_cert_path' => hiera('cinder::backend::dellemc_powerflex::driver_ssl_cert_path', undef)
'backend_availability_zone' => lookup('cinder::backend::dellemc_powerflex::backend_availability_zone',
undef, undef, undef),
'san_login' => lookup('cinder::backend::dellemc_powerflex::san_login', undef, undef, undef),
'san_password' => lookup('cinder::backend::dellemc_powerflex::san_password', undef, undef, undef),
'san_ip' => lookup('cinder::backend::dellemc_powerflex::san_ip', undef, undef, undef),
'powerflex_storage_pools' => lookup('cinder::backend::dellemc_powerflex::powerflex_storage_pools',
undef, undef, undef),
'powerflex_allow_migration_during_rebuild' => lookup('cinder::backend::dellemc_powerflex::powerflex_allow_migration_during_rebuild',
undef, undef, undef),
'powerflex_allow_non_padded_volumes' => lookup('cinder::backend::dellemc_powerflex::powerflex_allow_non_padded_volumes',
undef, undef, undef),
'powerflex_max_over_subscription_ratio' => lookup('cinder::backend::dellemc_powerflex::powerflex_max_over_subscription_ratio',
undef, undef, undef),
'powerflex_rest_server_port' => lookup('cinder::backend::dellemc_powerflex::powerflex_rest_server_port',
undef, undef, undef),
'powerflex_round_volume_capacity' => lookup('cinder::backend::dellemc_powerflex::powerflex_round_volume_capacity',
undef, undef, undef),
'powerflex_server_api_version' => lookup('cinder::backend::dellemc_powerflex::powerflex_server_api_version',
undef, undef, undef),
'powerflex_unmap_volume_before_deletion' => lookup('cinder::backend::dellemc_powerflex::powerflex_unmap_volume_before_deletion',
undef, undef, undef),
'san_thin_provision' => lookup('cinder::backend::dellemc_powerflex::san_thin_provision', undef, undef, undef),
'driver_ssl_cert_verify' => lookup('cinder::backend::dellemc_powerflex::driver_ssl_cert_verify',
undef, undef, undef),
'driver_ssl_cert_path' => lookup('cinder::backend::dellemc_powerflex::driver_ssl_cert_path', undef, undef, undef)
})})
}
}

28
manifests/profile/base/cinder/volume/dellemc_powermax.pp
View File

@ -20,35 +20,35 @@
#
# [*backend_name*]
# (Optional) List of names given to the Cinder backend stanza.
# Defaults to hiera('cinder::backend:dellemc_powermax::volume_backend_name,'
# Defaults to lookup('cinder::backend:dellemc_powermax::volume_backend_name', undef, undef,
# ['tripleo_dellemc_powermax'])
#
# [*multi_config*]
# (Optional) A config hash when multiple backends are used.
# Defaults to hiera('cinder::backend::dellemc_powermax::volume_multi_config', {})
# Defaults to lookup('cinder::backend::dellemc_powermax::volume_multi_config', 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::cinder::volume::dellemc_powermax (
$backend_name = hiera('cinder::backend::dellemc_powermax::volume_backend_name', ['tripleo_dellemc_powermax']),
$multi_config = hiera('cinder::backend::dellemc_powermax::volume_multi_config', {}),
$step = Integer(hiera('step')),
$backend_name = lookup('cinder::backend::dellemc_powermax::volume_backend_name', undef, undef, ['tripleo_dellemc_powermax']),
$multi_config = lookup('cinder::backend::dellemc_powermax::volume_multi_config', undef, undef, {}),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
$backend_defaults = {
'CinderPowermaxAvailabilityZone' => hiera('cinder::backend::dellemc_powermax::backend_availability_zone', undef),
'CinderPowermaxSanIp' => hiera('cinder::backend::dellemc_powermax::san_ip', undef),
'CinderPowermaxSanLogin' => hiera('cinder::backend::dellemc_powermax::san_login', undef),
'CinderPowermaxSanPassword' => hiera('cinder::backend::dellemc_powermax::san_password', undef),
'CinderPowermaxStorageProtocol' => hiera('cinder::backend::dellemc_powermax::powermax_storage_protocol', undef),
'CinderPowermaxArray' => hiera('cinder::backend::dellemc_powermax::powermax_array', undef),
'CinderPowermaxSrp' => hiera('cinder::backend::dellemc_powermax::powermax_srp', undef),
'CinderPowermaxPortGroups' => hiera('cinder::backend::dellemc_powermax::powermax_port_groups', undef),
'CinderPowermaxAvailabilityZone' => lookup('cinder::backend::dellemc_powermax::backend_availability_zone', undef, undef, undef),
'CinderPowermaxSanIp' => lookup('cinder::backend::dellemc_powermax::san_ip', undef, undef, undef),
'CinderPowermaxSanLogin' => lookup('cinder::backend::dellemc_powermax::san_login', undef, undef, undef),
'CinderPowermaxSanPassword' => lookup('cinder::backend::dellemc_powermax::san_password', undef, undef, undef),
'CinderPowermaxStorageProtocol' => lookup('cinder::backend::dellemc_powermax::powermax_storage_protocol', undef, undef, undef),
'CinderPowermaxArray' => lookup('cinder::backend::dellemc_powermax::powermax_array', undef, undef, undef),
'CinderPowermaxSrp' => lookup('cinder::backend::dellemc_powermax::powermax_srp', undef, undef, undef),
'CinderPowermaxPortGroups' => lookup('cinder::backend::dellemc_powermax::powermax_port_groups', undef, undef, undef),
}
any2array($backend_name).each |String $backend| {

24
manifests/profile/base/cinder/volume/dellemc_powerstore.pp
View File

@ -20,33 +20,33 @@
#
# [*backend_name*]
# (Optional) List of names given to the Cinder backend stanza.
# Defaults to hiera('cinder::backend:dellemc_powerstore::volume_backend_name,'
# Defaults to lookup('cinder::backend:dellemc_powerstore::volume_backend_name', undef, undef,
# ['tripleo_dellemc_powerstore'])
#
# [*multi_config*]
# (Optional) A config hash when multiple backends are used.
# Defaults to hiera('cinder::backend::dellemc_powerstore::volume_multi_config', {})
# Defaults to lookup('cinder::backend::dellemc_powerstore::volume_multi_config', 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::cinder::volume::dellemc_powerstore (
$backend_name = hiera('cinder::backend::dellemc_powerstore::volume_backend_name', ['tripleo_dellemc_powerstore']),
$multi_config = hiera('cinder::backend::dellemc_powerstore::volume_multi_config', {}),
$step = Integer(hiera('step')),
$backend_name = lookup('cinder::backend::dellemc_powerstore::volume_backend_name', undef, undef, ['tripleo_dellemc_powerstore']),
$multi_config = lookup('cinder::backend::dellemc_powerstore::volume_multi_config', undef, undef, {}),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
$backend_defaults = {
'CinderPowerStoreAvailabilityZone' => hiera('cinder::backend::dellemc_powerstore::backend_availability_zone', undef),
'CinderPowerStoreSanIp' => hiera('cinder::backend::dellemc_powerstore::san_ip', undef),
'CinderPowerStoreSanLogin' => hiera('cinder::backend::dellemc_powerstore::san_login', undef),
'CinderPowerStoreSanPassword' => hiera('cinder::backend::dellemc_powerstore::san_password', undef),
'CinderPowerStoreStorageProtocol' => hiera('cinder::backend::dellemc_powerstore::storage_protocol', undef),
'CinderPowerStorePorts' => hiera('cinder::backend::dellemc_powerstore::powerstore_ports', undef),
'CinderPowerStoreAvailabilityZone' => lookup('cinder::backend::dellemc_powerstore::backend_availability_zone', undef, undef, undef),
'CinderPowerStoreSanIp' => lookup('cinder::backend::dellemc_powerstore::san_ip', undef, undef, undef),
'CinderPowerStoreSanLogin' => lookup('cinder::backend::dellemc_powerstore::san_login', undef, undef, undef),
'CinderPowerStoreSanPassword' => lookup('cinder::backend::dellemc_powerstore::san_password', undef, undef, undef),
'CinderPowerStoreStorageProtocol' => lookup('cinder::backend::dellemc_powerstore::storage_protocol', undef, undef, undef),
'CinderPowerStorePorts' => lookup('cinder::backend::dellemc_powerstore::powerstore_ports', undef, undef, undef),
}
any2array($backend_name).each |String $backend| {

46
manifests/profile/base/cinder/volume/dellemc_sc.pp
View File

@ -20,44 +20,44 @@
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_dellemc_sc'
# Defaults to lookup('cinder::backend::dellemc_sc::volume_backend_name', undef, undef, ['tripleo_dellemc_sc'])
#
# [*multi_config*]
# (Optional) A config hash when multiple backends are used.
# Defaults to hiera('cinder::backend::dellemc_sc::volume_multi_config', {})
# Defaults to lookup('cinder::backend::dellemc_sc::volume_multi_config', 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::cinder::volume::dellemc_sc (
$backend_name = hiera('cinder::backend::dellemc_sc::volume_backend_name', ['tripleo_dellemc_sc']),
$multi_config = hiera('cinder::backend::dellemc_sc::volume_multi_config', {}),
$step = Integer(hiera('step')),
$backend_name = lookup('cinder::backend::dellemc_sc::volume_backend_name', undef, undef, ['tripleo_dellemc_sc']),
$multi_config = lookup('cinder::backend::dellemc_sc::volume_multi_config', undef, undef, {}),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
$backend_defaults = {
'CinderSCAvailabilityZone' => hiera('cinder::backend::dellemc_sc::backend_availability_zone', undef),
'CinderSCSanIp' => hiera('cinder::backend::dellemc_sc::san_ip', undef),
'CinderSCSanLogin' => hiera('cinder::backend::dellemc_sc::san_login', undef),
'CinderSCSanPassword' => hiera('cinder::backend::dellemc_sc::san_password', undef),
'CinderSCStorageProtocol' => hiera('cinder::backend::dellemc_sc::sc_storage_protocol', undef),
'CinderSCSSN' => hiera('cinder::backend::dellemc_sc::dell_sc_ssn', undef),
'CinderSCTargetIpAddress' => hiera('cinder::backend::dellemc_sc::iscsi_ip_address', undef),
'CinderSCTargetPort' => hiera('cinder::backend::dellemc_sc::iscsi_port', undef),
'CinderSCApiPort' => hiera('cinder::backend::dellemc_sc::dell_sc_api_port', undef),
'CinderSCServerFolder' => hiera('cinder::backend::dellemc_sc::dell_sc_server_folder', undef),
'CinderSCVolumeFolder' => hiera('cinder::backend::dellemc_sc::dell_sc_volume_folder', undef),
'CinderSCExcludedDomainIps' => hiera('cinder::backend::dellemc_sc::excluded_domain_ips', undef),
'CinderSCSecondarySanIp' => hiera('cinder::backend::dellemc_sc::secondary_san_ip', undef),
'CinderSCSecondarySanLogin' => hiera('cinder::backend::dellemc_sc::secondary_san_login', undef),
'CinderSCSecondarySanPassword' => hiera('cinder::backend::dellemc_sc::secondary_san_password', undef),
'CinderSCSecondaryApiPort' => hiera('cinder::backend::dellemc_sc::secondary_sc_api_port', undef),
'CinderSCUseMultipathForImageXfer' => hiera('cinder::backend::dellemc_sc::use_multipath_for_image_xfer', undef),
'CinderSCAvailabilityZone' => lookup('cinder::backend::dellemc_sc::backend_availability_zone', undef, undef, undef),
'CinderSCSanIp' => lookup('cinder::backend::dellemc_sc::san_ip', undef, undef, undef),
'CinderSCSanLogin' => lookup('cinder::backend::dellemc_sc::san_login', undef, undef, undef),
'CinderSCSanPassword' => lookup('cinder::backend::dellemc_sc::san_password', undef, undef, undef),
'CinderSCStorageProtocol' => lookup('cinder::backend::dellemc_sc::sc_storage_protocol', undef, undef, undef),
'CinderSCSSN' => lookup('cinder::backend::dellemc_sc::dell_sc_ssn', undef, undef, undef),
'CinderSCTargetIpAddress' => lookup('cinder::backend::dellemc_sc::iscsi_ip_address', undef, undef, undef),
'CinderSCTargetPort' => lookup('cinder::backend::dellemc_sc::iscsi_port', undef, undef, undef),
'CinderSCApiPort' => lookup('cinder::backend::dellemc_sc::dell_sc_api_port', undef, undef, undef),
'CinderSCServerFolder' => lookup('cinder::backend::dellemc_sc::dell_sc_server_folder', undef, undef, undef),
'CinderSCVolumeFolder' => lookup('cinder::backend::dellemc_sc::dell_sc_volume_folder', undef, undef, undef),
'CinderSCExcludedDomainIps' => lookup('cinder::backend::dellemc_sc::excluded_domain_ips', undef, undef, undef),
'CinderSCSecondarySanIp' => lookup('cinder::backend::dellemc_sc::secondary_san_ip', undef, undef, undef),
'CinderSCSecondarySanLogin' => lookup('cinder::backend::dellemc_sc::secondary_san_login', undef, undef, undef),
'CinderSCSecondarySanPassword' => lookup('cinder::backend::dellemc_sc::secondary_san_password', undef, undef, undef),
'CinderSCSecondaryApiPort' => lookup('cinder::backend::dellemc_sc::secondary_sc_api_port', undef, undef, undef),
'CinderSCUseMultipathForImageXfer' => lookup('cinder::backend::dellemc_sc::use_multipath_for_image_xfer', undef, undef, undef),
}
any2array($backend_name).each |String $backend| {

22
manifests/profile/base/cinder/volume/dellemc_unity.pp
View File

@ -20,28 +20,28 @@
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_dellemc_unity'
# Defaults to lookup('cinder::backend::dellemc_unity::volume_backend_name', undef, undef, 'tripleo_dellemc_unity')
#
# [*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::cinder::volume::dellemc_unity (
$backend_name = hiera('cinder::backend::dellemc_unity::volume_backend_name', 'tripleo_dellemc_unity'),
$step = Integer(hiera('step')),
$backend_name = lookup('cinder::backend::dellemc_unity::volume_backend_name', undef, undef, 'tripleo_dellemc_unity'),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
create_resources('cinder::backend::dellemc_unity', { $backend_name => delete_undef_values({
'backend_availability_zone' => hiera('cinder::backend::dellemc_unity::backend_availability_zone', undef),
'san_ip' => hiera('cinder::backend::dellemc_unity::san_ip', undef),
'san_login' => hiera('cinder::backend::dellemc_unity::san_login', undef),
'san_password' => hiera('cinder::backend::dellemc_unity::san_password', undef),
'storage_protocol' => hiera('cinder::backend::dellemc_unity::storage_protocol', undef),
'unity_io_ports' => hiera('cinder::backend::dellemc_unity::unity_io_ports', undef),
'unity_storage_pool_names' => hiera('cinder::backend::dellemc_unity::unity_storage_pool_names', undef),
'backend_availability_zone' => lookup('cinder::backend::dellemc_unity::backend_availability_zone', undef, undef, undef),
'san_ip' => lookup('cinder::backend::dellemc_unity::san_ip', undef, undef, undef),
'san_login' => lookup('cinder::backend::dellemc_unity::san_login', undef, undef, undef),
'san_password' => lookup('cinder::backend::dellemc_unity::san_password', undef, undef, undef),
'storage_protocol' => lookup('cinder::backend::dellemc_unity::storage_protocol', undef, undef, undef),
'unity_io_ports' => lookup('cinder::backend::dellemc_unity::unity_io_ports', undef, undef, undef),
'unity_storage_pool_names' => lookup('cinder::backend::dellemc_unity::unity_storage_pool_names', undef, undef, undef),
})})
}

38
manifests/profile/base/cinder/volume/dellemc_vnx.pp
View File

@ -20,38 +20,38 @@
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_dellemc_vnx'
# Defaults to lookup('cinder::backend::emc_vnx::volume_backend_name', undef, undef, 'tripleo_dellemc_vnx')
#
# [*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::cinder::volume::dellemc_vnx (
$backend_name = hiera('cinder::backend::emc_vnx::volume_backend_name', 'tripleo_dellemc_vnx'),
$step = Integer(hiera('step')),
$backend_name = lookup('cinder::backend::emc_vnx::volume_backend_name', undef, undef, 'tripleo_dellemc_vnx'),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
# Accept recently deprecated 'storage_vnx_pool_name'
$storage_vnx_pool_names_real = pick(hiera('cinder::backend::emc_vnx::storage_vnx_pool_names',
hiera('cinder::backend::emc_vnx::storage_vnx_pool_name',
undef)))
$storage_vnx_pool_names_real = pick(lookup('cinder::backend::emc_vnx::storage_vnx_pool_names', undef, undef,
lookup('cinder::backend::emc_vnx::storage_vnx_pool_name',
undef, undef, undef)))
create_resources('cinder::backend::emc_vnx', { $backend_name => delete_undef_values({
'backend_availability_zone' => hiera('cinder::backend::emc_vnx::backend_availability_zone', undef),
'san_ip' => hiera('cinder::backend::emc_vnx::san_ip', undef),
'san_login' => hiera('cinder::backend::emc_vnx::san_login', undef),
'san_password' => hiera('cinder::backend::emc_vnx::san_password', undef),
'storage_protocol' => hiera('cinder::backend::emc_vnx::storage_protocol', undef),
'storage_vnx_pool_names' => hiera('cinder::backend::emc_vnx::storage_vnx_pool_names', undef),
'default_timeout' => hiera('cinder::backend::emc_vnx::default_timeout', undef),
'max_luns_per_storage_group' => hiera('cinder::backend::emc_vnx::max_luns_per_storage_group', undef),
'initiator_auto_registration' => hiera('cinder::backend::emc_vnx::initiator_auto_registration', undef),
'storage_vnx_auth_type' => hiera('cinder::backend::emc_vnx::storage_vnx_auth_type', undef),
'storage_vnx_security_file_dir' => hiera('cinder::backend::emc_vnx::storage_vnx_security_file_dir', undef),
'naviseccli_path' => hiera('cinder::backend::emc_vnx::naviseccli_path', undef),
'backend_availability_zone' => lookup('cinder::backend::emc_vnx::backend_availability_zone', undef, undef, undef),
'san_ip' => lookup('cinder::backend::emc_vnx::san_ip', undef, undef, undef),
'san_login' => lookup('cinder::backend::emc_vnx::san_login', undef, undef, undef),
'san_password' => lookup('cinder::backend::emc_vnx::san_password', undef, undef, undef),
'storage_protocol' => lookup('cinder::backend::emc_vnx::storage_protocol', undef, undef, undef),
'storage_vnx_pool_names' => lookup('cinder::backend::emc_vnx::storage_vnx_pool_names', undef, undef, undef),
'default_timeout' => lookup('cinder::backend::emc_vnx::default_timeout', undef, undef, undef),
'max_luns_per_storage_group' => lookup('cinder::backend::emc_vnx::max_luns_per_storage_group', undef, undef, undef),
'initiator_auto_registration' => lookup('cinder::backend::emc_vnx::initiator_auto_registration', undef, undef, undef),
'storage_vnx_auth_type' => lookup('cinder::backend::emc_vnx::storage_vnx_auth_type', undef, undef, undef),
'storage_vnx_security_file_dir' => lookup('cinder::backend::emc_vnx::storage_vnx_security_file_dir', undef, undef, undef),
'naviseccli_path' => lookup('cinder::backend::emc_vnx::naviseccli_path', undef, undef, undef),
})})
}

35
manifests/profile/base/cinder/volume/dellemc_xtremio.pp
View File

@ -20,37 +20,40 @@
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_dellemc_xtremio'
# Defaults to lookup('cinder::backend::dellemc_xtremio::volume_backend_name', undef, undef, ['tripleo_dellemc_xtremio'])
#
# [*multi_config*]
# (Optional) A config hash when multiple backends are used.
# Defaults to hiera('cinder::backend::dellemc_xtremio::volume_multi_config', {})
# Defaults to lookup('cinder::backend::dellemc_xtremio::volume_multi_config', 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::cinder::volume::dellemc_xtremio (
$backend_name = hiera('cinder::backend::dellemc_xtremio::volume_backend_name', ['tripleo_dellemc_xtremio']),
$multi_config = hiera('cinder::backend::dellemc_xtremio::volume_multi_config', {}),
$step = Integer(hiera('step')),
$backend_name = lookup('cinder::backend::dellemc_xtremio::volume_backend_name', undef, undef, ['tripleo_dellemc_xtremio']),
$multi_config = lookup('cinder::backend::dellemc_xtremio::volume_multi_config', undef, undef, {}),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
$backend_defaults = {
'CinderXtremioAvailabilityZone' => hiera('cinder::backend::dellemc_xtremio::backend_availability_zone', undef),
'CinderXtremioSanIp' => hiera('cinder::backend::dellemc_xtremio::san_ip', undef),
'CinderXtremioSanLogin' => hiera('cinder::backend::dellemc_xtremio::san_login', undef),
'CinderXtremioSanPassword' => hiera('cinder::backend::dellemc_xtremio::san_password', undef),
'CinderXtremioStorageProtocol' => hiera('cinder::backend::dellemc_xtremio::xtremio_storage_protocol', undef),
'CinderXtremioClusterName' => hiera('cinder::backend::dellemc_xtremio::xtremio_cluster_name', undef),
'CinderXtremioArrayBusyRetryCount' => hiera('cinder::backend::dellemc_xtremio::xtremio_array_busy_retry_count', undef),
'CinderXtremioArrayBusyRetryInterval'=> hiera('cinder::backend::dellemc_xtremio::xtremio_array_busy_retry_interval', undef),
'CinderXtremioVolumesPerGlanceCache' => hiera('cinder::backend::dellemc_xtremio::xtremio_volumes_per_glance_cache', undef),
'CinderXtremioPorts' => hiera('cinder::backend::dellemc_xtremio::xtremio_ports', undef),
'CinderXtremioAvailabilityZone' => lookup('cinder::backend::dellemc_xtremio::backend_availability_zone', undef, undef, undef),
'CinderXtremioSanIp' => lookup('cinder::backend::dellemc_xtremio::san_ip', undef, undef, undef),
'CinderXtremioSanLogin' => lookup('cinder::backend::dellemc_xtremio::san_login', undef, undef, undef),
'CinderXtremioSanPassword' => lookup('cinder::backend::dellemc_xtremio::san_password', undef, undef, undef),
'CinderXtremioStorageProtocol' => lookup('cinder::backend::dellemc_xtremio::xtremio_storage_protocol', undef, undef, undef),
'CinderXtremioClusterName' => lookup('cinder::backend::dellemc_xtremio::xtremio_cluster_name', undef, undef, undef),
'CinderXtremioArrayBusyRetryCount' => lookup('cinder::backend::dellemc_xtremio::xtremio_array_busy_retry_count',
undef, undef, undef),
'CinderXtremioArrayBusyRetryInterval'=> lookup('cinder::backend::dellemc_xtremio::xtremio_array_busy_retry_interval',
undef, undef, undef),
'CinderXtremioVolumesPerGlanceCache' => lookup('cinder::backend::dellemc_xtremio::xtremio_volumes_per_glance_cache',
undef, undef, undef),
'CinderXtremioPorts' => lookup('cinder::backend::dellemc_xtremio::xtremio_ports', undef, undef, undef),
}
any2array($backend_name).each |String $backend| {

42
manifests/profile/base/cinder/volume/dellsc.pp
View File

@ -20,16 +20,16 @@
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_dellsc'
# Defaults to lookup('cinder::backend::dellsc_iscsi::volume_backend_name', undef, undef, 'tripleo_dellsc')
#
# [*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::cinder::volume::dellsc (
$backend_name = hiera('cinder::backend::dellsc_iscsi::volume_backend_name', 'tripleo_dellsc'),
$step = Integer(hiera('step')),
$backend_name = lookup('cinder::backend::dellsc_iscsi::volume_backend_name', undef, undef, 'tripleo_dellsc'),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume
@ -38,27 +38,27 @@ class tripleo::profile::base::cinder::volume::dellsc (
if $step >= 4 {
# Include support for 'excluded_domain_ip' until it's deprecated in THT
$excluded_domain_ip = hiera('cinder::backend::dellsc_iscsi::excluded_domain_ip', undef)
$excluded_domain_ips = hiera('cinder::backend::dellsc_iscsi::excluded_domain_ips', undef)
$excluded_domain_ip = lookup('cinder::backend::dellsc_iscsi::excluded_domain_ip', undef, undef, undef)
$excluded_domain_ips = lookup('cinder::backend::dellsc_iscsi::excluded_domain_ips', undef, undef, undef)
$excluded_domain_ips_real = pick_default($excluded_domain_ips, $excluded_domain_ip, undef)
create_resources('cinder::backend::dellsc_iscsi', { $backend_name => delete_undef_values({
'backend_availability_zone' => hiera('cinder::backend::dellsc_iscsi::backend_availability_zone', undef),
'san_ip' => hiera('cinder::backend::dellsc_iscsi::san_ip', undef),
'san_login' => hiera('cinder::backend::dellsc_iscsi::san_login', undef),
'san_password' => hiera('cinder::backend::dellsc_iscsi::san_password', undef),
'dell_sc_ssn' => hiera('cinder::backend::dellsc_iscsi::dell_sc_ssn', undef),
'target_ip_address' => hiera('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef),
'target_port' => hiera('cinder::backend::dellsc_iscsi::iscsi_port', undef),
'dell_sc_api_port' => hiera('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef),
'dell_sc_server_folder' => hiera('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef),
'dell_sc_volume_folder' => hiera('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef),
'backend_availability_zone' => lookup('cinder::backend::dellsc_iscsi::backend_availability_zone', undef, undef, undef),
'san_ip' => lookup('cinder::backend::dellsc_iscsi::san_ip', undef, undef, undef),
'san_login' => lookup('cinder::backend::dellsc_iscsi::san_login', undef, undef, undef),
'san_password' => lookup('cinder::backend::dellsc_iscsi::san_password', undef, undef, undef),
'dell_sc_ssn' => lookup('cinder::backend::dellsc_iscsi::dell_sc_ssn', undef, undef, undef),
'target_ip_address' => lookup('cinder::backend::dellsc_iscsi::iscsi_ip_address', undef, undef, undef),
'target_port' => lookup('cinder::backend::dellsc_iscsi::iscsi_port', undef, undef, undef),
'dell_sc_api_port' => lookup('cinder::backend::dellsc_iscsi::dell_sc_api_port', undef, undef, undef),
'dell_sc_server_folder' => lookup('cinder::backend::dellsc_iscsi::dell_sc_server_folder', undef, undef, undef),
'dell_sc_volume_folder' => lookup('cinder::backend::dellsc_iscsi::dell_sc_volume_folder', undef, undef, undef),
'excluded_domain_ips' => $excluded_domain_ips_real,
'secondary_san_ip' => hiera('cinder::backend::dellsc_iscsi::secondary_san_ip', undef),
'secondary_san_login' => hiera('cinder::backend::dellsc_iscsi::secondary_san_login', undef),
'secondary_san_password' => hiera('cinder::backend::dellsc_iscsi::secondary_san_password', undef),
'secondary_sc_api_port' => hiera('cinder::backend::dellsc_iscsi::secondary_sc_api_port', undef),
'use_multipath_for_image_xfer' => hiera('cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer', undef),
'secondary_san_ip' => lookup('cinder::backend::dellsc_iscsi::secondary_san_ip', undef, undef, undef),
'secondary_san_login' => lookup('cinder::backend::dellsc_iscsi::secondary_san_login', undef, undef, undef),
'secondary_san_password' => lookup('cinder::backend::dellsc_iscsi::secondary_san_password', undef, undef, undef),
'secondary_sc_api_port' => lookup('cinder::backend::dellsc_iscsi::secondary_sc_api_port', undef, undef, undef),
'use_multipath_for_image_xfer' => lookup('cinder::backend::dellsc_iscsi::use_multipath_for_image_xfer', undef, undef, undef),
})})
}

12
manifests/profile/base/cinder/volume/iscsi.pp
View File

@ -23,11 +23,11 @@
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_iscsi'
# Defaults to lookup('cinder::backend::iscsi::volume_backend_name', undef, undef, 'tripleo_iscsi')
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this volume backend
# Defaults to hiera('cinder::backend::iscsi::backend_availability_zone', undef)
# Defaults to lookup('cinder::backend::iscsi::backend_availability_zone', undef, undef, undef)
#
# [*cinder_iscsi_helper*]
# (Optional) The iscsi helper to use
@ -40,15 +40,15 @@
# [*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::cinder::volume::iscsi (
$cinder_iscsi_address,
$backend_name = hiera('cinder::backend::iscsi::volume_backend_name', 'tripleo_iscsi'),
$backend_availability_zone = hiera('cinder::backend::iscsi::backend_availability_zone', undef),
$backend_name = lookup('cinder::backend::iscsi::volume_backend_name', undef, undef, 'tripleo_iscsi'),
$backend_availability_zone = lookup('cinder::backend::iscsi::backend_availability_zone', undef, undef, undef),
$cinder_iscsi_helper = 'tgtadm',
$cinder_iscsi_protocol = 'iscsi',
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume

58
manifests/profile/base/cinder/volume/netapp.pp
View File

@ -20,49 +20,49 @@
#
# [*backend_name*]
# (Optional) List of names given to the Cinder backend stanza.
# Defaults to hiera('cinder::backend::netapp::volume_backend_name', ['tripleo_netapp'])
# Defaults to lookup('cinder::backend::netapp::volume_backend_name', undef, undef, ['tripleo_netapp'])
#
# [*multi_config*]
# (Optional) A config hash when multiple backends are used.
# Defaults to hiera('cinder::backend::netapp::volume_multi_config', {})
# Defaults to lookup('cinder::backend::netapp::volume_multi_config', 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::cinder::volume::netapp (
$backend_name = hiera('cinder::backend::netapp::volume_backend_name', ['tripleo_netapp']),
$multi_config = hiera('cinder::backend::netapp::volume_multi_config', {}),
$step = Integer(hiera('step')),
$backend_name = lookup('cinder::backend::netapp::volume_backend_name', undef, undef, ['tripleo_netapp']),
$multi_config = lookup('cinder::backend::netapp::volume_multi_config', undef, undef, {}),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
$backend_defaults = {
'CinderNetappAvailabilityZone' => hiera('cinder::backend::netapp::backend_availability_zone', undef),
'CinderNetappLogin' => hiera('cinder::backend::netapp::netapp_login', undef),
'CinderNetappPassword' => hiera('cinder::backend::netapp::netapp_password', undef),
'CinderNetappServerHostname' => hiera('cinder::backend::netapp::netapp_server_hostname', undef),
'CinderNetappServerPort' => hiera('cinder::backend::netapp::netapp_server_port', undef),
'CinderNetappSizeMultiplier' => hiera('cinder::backend::netapp::netapp_size_multiplier', undef),
'CinderNetappStorageFamily' => hiera('cinder::backend::netapp::netapp_storage_family', undef),
'CinderNetappStorageProtocol' => hiera('cinder::backend::netapp::netapp_storage_protocol', undef),
'CinderNetappTransportType' => hiera('cinder::backend::netapp::netapp_transport_type', undef),
'CinderNetappVfiler' => hiera('cinder::backend::netapp::netapp_vfiler', undef),
'CinderNetappVserver' => hiera('cinder::backend::netapp::netapp_vserver', undef),
'CinderNetappPartnerBackendName' => hiera('cinder::backend::netapp::netapp_partner_backend_name', undef),
'CinderNetappNfsShares' => hiera('cinder::backend::netapp::nfs_shares', undef),
'CinderNetappNfsSharesConfig' => hiera('cinder::backend::netapp::nfs_shares_config', undef),
'CinderNetappNfsMountOptions' => hiera('cinder::backend::netapp::nfs_mount_options', undef),
'CinderNetappCopyOffloadToolPath' => hiera('cinder::backend::netapp::netapp_copyoffload_tool_path', undef),
'CinderNetappControllerIps' => hiera('cinder::backend::netapp::netapp_controller_ips', undef),
'CinderNetappSaPassword' => hiera('cinder::backend::netapp::netapp_sa_password', undef),
'CinderNetappHostType' => hiera('cinder::backend::netapp::netapp_host_type', undef),
'CinderNetappWebservicePath' => hiera('cinder::backend::netapp::netapp_webservice_path', undef),
'CinderNetappNasSecureFileOperations' => hiera('cinder::backend::netapp::nas_secure_file_operations', undef),
'CinderNetappNasSecureFilePermissions' => hiera('cinder::backend::netapp::nas_secure_file_permissions', undef),
'CinderNetappPoolNameSearchPattern' => hiera('cinder::backend::netapp::netapp_pool_name_search_pattern', undef),
'CinderNetappAvailabilityZone' => lookup('cinder::backend::netapp::backend_availability_zone', undef, undef, undef),
'CinderNetappLogin' => lookup('cinder::backend::netapp::netapp_login', undef, undef, undef),
'CinderNetappPassword' => lookup('cinder::backend::netapp::netapp_password', undef, undef, undef),
'CinderNetappServerHostname' => lookup('cinder::backend::netapp::netapp_server_hostname', undef, undef, undef),
'CinderNetappServerPort' => lookup('cinder::backend::netapp::netapp_server_port', undef, undef, undef),
'CinderNetappSizeMultiplier' => lookup('cinder::backend::netapp::netapp_size_multiplier', undef, undef, undef),
'CinderNetappStorageFamily' => lookup('cinder::backend::netapp::netapp_storage_family', undef, undef, undef),
'CinderNetappStorageProtocol' => lookup('cinder::backend::netapp::netapp_storage_protocol', undef, undef, undef),
'CinderNetappTransportType' => lookup('cinder::backend::netapp::netapp_transport_type', undef, undef, undef),
'CinderNetappVfiler' => lookup('cinder::backend::netapp::netapp_vfiler', undef, undef, undef),
'CinderNetappVserver' => lookup('cinder::backend::netapp::netapp_vserver', undef, undef, undef),
'CinderNetappPartnerBackendName' => lookup('cinder::backend::netapp::netapp_partner_backend_name', undef, undef, undef),
'CinderNetappNfsShares' => lookup('cinder::backend::netapp::nfs_shares', undef, undef, undef),
'CinderNetappNfsSharesConfig' => lookup('cinder::backend::netapp::nfs_shares_config', undef, undef, undef),
'CinderNetappNfsMountOptions' => lookup('cinder::backend::netapp::nfs_mount_options', undef, undef, undef),
'CinderNetappCopyOffloadToolPath' => lookup('cinder::backend::netapp::netapp_copyoffload_tool_path', undef, undef, undef),
'CinderNetappControllerIps' => lookup('cinder::backend::netapp::netapp_controller_ips', undef, undef, undef),
'CinderNetappSaPassword' => lookup('cinder::backend::netapp::netapp_sa_password', undef, undef, undef),
'CinderNetappHostType' => lookup('cinder::backend::netapp::netapp_host_type', undef, undef, undef),
'CinderNetappWebservicePath' => lookup('cinder::backend::netapp::netapp_webservice_path', undef, undef, undef),
'CinderNetappNasSecureFileOperations' => lookup('cinder::backend::netapp::nas_secure_file_operations', undef, undef, undef),
'CinderNetappNasSecureFilePermissions' => lookup('cinder::backend::netapp::nas_secure_file_permissions', undef, undef, undef),
'CinderNetappPoolNameSearchPattern' => lookup('cinder::backend::netapp::netapp_pool_name_search_pattern', undef, undef, undef),
}
any2array($backend_name).each |String $backend| {

12
manifests/profile/base/cinder/volume/nfs.pp
View File

@ -23,11 +23,11 @@
#
# [*backend_name*]
# (Optional) Name given to the Cinder backend stanza
# Defaults to 'tripleo_nfs'
# Defaults to lookup('cinder::backend::nfs::volume_backend_name', undef, undef, 'tripleo_nfs')
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this volume backend
# Defaults to hiera('cinder::backend::nfs::backend_availability_zone', undef)
# Defaults to lookup('cinder::backend::nfs::backend_availability_zone', undef, undef, undef)
#
# [*cinder_nfs_mount_options*]
# (Optional) List of mount options for the NFS share
@ -57,17 +57,17 @@
# [*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::cinder::volume::nfs (
$cinder_nfs_servers,
$backend_name = hiera('cinder::backend::nfs::volume_backend_name', 'tripleo_nfs'),
$backend_availability_zone = hiera('cinder::backend::nfs::backend_availability_zone', undef),
$backend_name = lookup('cinder::backend::nfs::volume_backend_name', undef, undef, 'tripleo_nfs'),
$backend_availability_zone = lookup('cinder::backend::nfs::backend_availability_zone', undef, undef, undef),
$cinder_nfs_mount_options = '',
$cinder_nfs_snapshot_support = $::os_service_default,
$cinder_nas_secure_file_operations = $::os_service_default,
$cinder_nas_secure_file_permissions = $::os_service_default,
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume

12
manifests/profile/base/cinder/volume/nvmeof.pp
View File

@ -31,11 +31,11 @@
#
# [*volume_backend_name*]
# (Optional) Name given to the Cinder backend
# Defaults to 'tripleo_nvmeof'
# Defaults to lookup('cinder::backend::nvmeof::volume_backend_name', undef, undef, 'tripleo_nvmeof')
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this volume backend
# Defaults to hiera('cinder::backend::nvmeof::backend_availability_zone', undef)
# Defaults to lookup('cinder::backend::nvmeof::backend_availability_zone', undef, undef, undef)
#
# [*volume_driver*]
# (Optional) Driver to use for volume creation
@ -44,7 +44,7 @@
# [*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::cinder::volume::nvmeof (
$target_ip_address,
@ -54,10 +54,10 @@ class tripleo::profile::base::cinder::volume::nvmeof (
$target_prefix = 'nvme-subsystem',
$nvmet_port_id = '1',
$nvmet_ns_id = '10',
$volume_backend_name = hiera('cinder::backend::nvmeof::volume_backend_name', 'tripleo_nvmeof'),
$backend_availability_zone = hiera('cinder::backend::nvmeof::backend_availability_zone', undef),
$volume_backend_name = lookup('cinder::backend::nvmeof::volume_backend_name', undef, undef, 'tripleo_nvmeof'),
$backend_availability_zone = lookup('cinder::backend::nvmeof::backend_availability_zone', undef, undef, undef),
$volume_driver = 'cinder.volume.drivers.lvm.LVMVolumeDriver',
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume

32
manifests/profile/base/cinder/volume/pure.pp
View File

@ -20,36 +20,36 @@
#
# [*backend_name*]
# (Optional) List of names given to the Cinder backend stanza.
# Defaults to hiera('cinder::backend::pure::volume_backend_name', ['tripleo_pure'])
# Defaults to lookup('cinder::backend::pure::volume_backend_name', undef, undef, ['tripleo_pure'])
#
# [*multi_config*]
# (Optional) A config hash when multiple backends are used.
# Defaults to hiera('cinder::backend::pure::volume_multi_config', {})
# Defaults to lookup('cinder::backend::pure::volume_multi_config', 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::cinder::volume::pure (
$backend_name = hiera('cinder::backend::pure::volume_backend_name', ['tripleo_pure']),
$multi_config = hiera('cinder::backend::pure::volume_multi_config', {}),
$step = Integer(hiera('step')),
$backend_name = lookup('cinder::backend::pure::volume_backend_name', undef, undef, ['tripleo_pure']),
$multi_config = lookup('cinder::backend::pure::volume_multi_config', undef, undef, {}),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume
if $step >= 4 {
$backend_defaults = {
'CinderPureAvailabilityZone' => hiera('cinder::backend::pure::backend_availability_zone', undef),
'CinderPureSanIp' => hiera('cinder::backend::pure::san_ip', undef),
'CinderPureAPIToken' => hiera('cinder::backend::pure::pure_api_token', undef),
'CinderPureStorageProtocol' => hiera('cinder::backend::pure::pure_storage_protocol', undef),
'CinderPureUseChap' => hiera('cinder::backend::pure::use_chap_auth', undef),
'CinderPureMultipathXfer' => hiera('cinder::backend::pure::use_multipath_for_image_xfer', undef),
'CinderPureImageCache' => hiera('cinder::backend::pure::image_volume_cache_enabled', undef),
'CinderPureIscsiCidr' => hiera('cinder::backend::pure::pure_iscsi_cidr', undef),
'CinderPureHostPersonality' => hiera('cinder::backend::pure::pure_host_personality', undef),
'CinderPureEradicateOnDelete' => hiera('cinder::backend::pure::pure_eradicate_on_delete', undef),
'CinderPureAvailabilityZone' => lookup('cinder::backend::pure::backend_availability_zone', undef, undef, undef),
'CinderPureSanIp' => lookup('cinder::backend::pure::san_ip', undef, undef, undef),
'CinderPureAPIToken' => lookup('cinder::backend::pure::pure_api_token', undef, undef, undef),
'CinderPureStorageProtocol' => lookup('cinder::backend::pure::pure_storage_protocol', undef, undef, undef),
'CinderPureUseChap' => lookup('cinder::backend::pure::use_chap_auth', undef, undef, undef),
'CinderPureMultipathXfer' => lookup('cinder::backend::pure::use_multipath_for_image_xfer', undef, undef, undef),
'CinderPureImageCache' => lookup('cinder::backend::pure::image_volume_cache_enabled', undef, undef, undef),
'CinderPureIscsiCidr' => lookup('cinder::backend::pure::pure_iscsi_cidr', undef, undef, undef),
'CinderPureHostPersonality' => lookup('cinder::backend::pure::pure_host_personality', undef, undef, undef),
'CinderPureEradicateOnDelete' => lookup('cinder::backend::pure::pure_eradicate_on_delete', undef, undef, undef),
}
$backend_name.each |String $backend| {

23
manifests/profile/base/cinder/volume/rbd.pp
View File

@ -20,15 +20,15 @@
#
# [*backend_name*]
# (Optional) List of names given to the Cinder backend stanza.
# Defaults to hiera('cinder::backend::rbd::volume_backend_name', ['tripleo_ceph'])
# Defaults to lookup('cinder::backend::rbd::volume_backend_name', undef, undef, ['tripleo_ceph'])
#
# [*backend_availability_zone*]
# (Optional) Availability zone for this volume backend
# Defaults to hiera('cinder::backend::rbd::backend_availability_zone', undef)
# Defaults to lookup('cinder::backend::rbd::backend_availability_zone', undef, undef, undef)
#
# [*cinder_rbd_backend_host*]
# (Optional) String to use as backend_host in the backend stanza
# Defaults to hiera('cinder::backend_host', hiera('cinder::host', $::hostname))
# Defaults to lookup('cinder::backend_host', undef, undef, lookup('cinder::host', undef, undef, $::hostname))
#
# [*cinder_rbd_ceph_conf*]
# (Optional) The path to the Ceph cluster config file
@ -54,7 +54,7 @@
# [*cinder_rbd_flatten_volume_from_snapshot*]
# (Optional) Whether volumes created from a snapshot should be flattened
# in order to remove a dependency on the snapshot.
# Defaults to hiera('cinder::backend::rbd::flatten_volume_from_snapshot, undef)
# Defaults to lookup('cinder::backend::rbd::flatten_volume_from_snapshot, undef, undef, undef)
#
# [*multi_config*]
# (Optional) A config hash when multiple backends are used.
@ -68,23 +68,24 @@
# [*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::cinder::volume::rbd (
$backend_name = hiera('cinder::backend::rbd::volume_backend_name', ['tripleo_ceph']),
$backend_availability_zone = hiera('cinder::backend::rbd::backend_availability_zone', undef),
$backend_name = lookup('cinder::backend::rbd::volume_backend_name', undef, undef, ['tripleo_ceph']),
$backend_availability_zone = lookup('cinder::backend::rbd::backend_availability_zone', undef, undef, undef),
# lint:ignore:parameter_documentation
$cinder_rbd_backend_host = hiera('cinder::backend_host', hiera('cinder::host', $::hostname)),
$cinder_rbd_backend_host = lookup('cinder::backend_host', undef, undef, lookup('cinder::host',
undef, undef, $::hostname)),
# lint:endignore
$cinder_rbd_ceph_conf = hiera('cinder::backend::rbd::rbd_ceph_conf', '/etc/ceph/ceph.conf'),
$cinder_rbd_ceph_conf = lookup('cinder::backend::rbd::rbd_ceph_conf', undef, undef, '/etc/ceph/ceph.conf'),
$cinder_rbd_pool_name = 'volumes',
$cinder_rbd_extra_pools = undef,
$cinder_rbd_secret_uuid = undef,
$cinder_rbd_user_name = 'openstack',
$cinder_rbd_flatten_volume_from_snapshot = hiera('cinder::backend::rbd::flatten_volume_from_snapshot', undef),
$cinder_rbd_flatten_volume_from_snapshot = lookup('cinder::backend::rbd::flatten_volume_from_snapshot', undef, undef, undef),
$multi_config = {},
$extra_options = {},
$step = Integer(hiera('step')),
$step = Integer(lookup('step')),
) {
include tripleo::profile::base::cinder::volume