openstack
/
puppet-tripleo
Code Issues Proposed changes

Add missing portset parameter to Svf driver 

This patch adds missing configuration parameter 'storwize_portset'
to Cinder IBM Spectrum virtualize family (Svf) driver.

Depends-On: I0b28036bc04b5c0c59347f70273cf0f82848c829
Change-Id: I7734542f710d1aa726b9637847231bb84a368da9
This commit is contained in:
katarimanoj 2023-01-31 14:00:58 +05:30
parent 6372a182e4
commit 0eb1743fe5
2 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/cinder/volume/ibm_svf.pp
View File

@ -38,6 +38,7 @@ class tripleo::profile::base::cinder::volume::ibm_svf (
'CinderSvfIscsiChapEnabled' => lookup('cinder::backend::ibm_svf::storwize_svc_iscsi_chap_enabled', undef, undef, undef),
'CinderSvfRetainAuxVolume' => lookup('cinder::backend::ibm_svf::storwize_svc_retain_aux_volume', undef, undef, undef),
'CinderSvfVolumePoolName' => lookup('cinder::backend::ibm_svf::storwize_svc_volpool_name', undef, undef, undef),
'CinderSvfPortset' => lookup('cinder::backend::ibm_svf::storwize_portset', undef, undef, undef),
}
any2array($backend_name).each |String $backend| {
@ -53,6 +54,7 @@ class tripleo::profile::base::cinder::volume::ibm_svf (
'storwize_svc_iscsi_chap_enabled' => $backend_config['CinderSvfIscsiChapEnabled'],
'storwize_svc_retain_aux_volume' => $backend_config['CinderSvfRetainAuxVolume'],
'storwize_svc_volpool_name' => $backend_config['CinderSvfVolumePoolName'],
'storwize_portset' => $backend_config['CinderSvfPortset'],
})})
}
}

47
manifests/profile/base/etcd.pp
View File

@ -18,22 +18,6 @@
#
# === Parameters
#
# [*bind_ip*]
# (optional) IP to bind etcd service to.
# Defaults to '127.0.0.1'.
#
# [*client_port*]
# (optional) etcd client listening port.
# Defaults to '2379'.
#
# [*peer_port*]
# (optional) etcd peer listening port.
# Defaults to '2380'.
#
# [*nodes*]
# (Optional) Array of host(s) for etcd nodes.
# Defaults to lookup('etcd_node_ips', undef, undef, []).
#
# [*certificate_specs*]
# (Optional) The specifications to give to certmonger for the certificate
# it will create. Note that the certificate nickname must be 'etcd' in
@ -46,53 +30,22 @@
# principal: "etcd/<overcloud controller fqdn>"
# Defaults to {}.
#
# [*enable_internal_tls*]
# (Optional) Whether TLS in the internal network is enabled or not.
# 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 Integer(lookup('step'))
#
class tripleo::profile::base::etcd (
$bind_ip = '127.0.0.1',
$client_port = '2379',
$peer_port = '2380',
$nodes = lookup('etcd_node_names', undef, undef, []),
$certificate_specs = {},
$enable_internal_tls = lookup('enable_internal_tls', undef, undef, false),
$step = Integer(lookup('step')),
) {
validate_legacy(Hash, 'validate_hash', $certificate_specs)
if $enable_internal_tls {
$tls_certfile = $certificate_specs['service_certificate']
$tls_keyfile = $certificate_specs['service_key']
$protocol = 'https'
} else {
$tls_certfile = undef
$tls_keyfile = undef
$protocol = 'http'
}
if $step >= 2 {
$bind_ip_normalized = normalize_ip_for_uri($bind_ip)
class {'etcd':
listen_client_urls => "${protocol}://${bind_ip_normalized}:${client_port}",
advertise_client_urls => "${protocol}://${bind_ip_normalized}:${client_port}",
listen_peer_urls => "${protocol}://${bind_ip_normalized}:${peer_port}",
initial_advertise_peer_urls => "${protocol}://${bind_ip_normalized}:${peer_port}",
initial_cluster => regsubst($nodes, '.+', "\\0=${protocol}://\\0:${peer_port}"),
proxy => 'off',
cert_file => $tls_certfile,
key_file => $tls_keyfile,
client_cert_auth => $enable_internal_tls,
peer_cert_file => $tls_certfile,
peer_key_file => $tls_keyfile,
peer_client_cert_auth => $enable_internal_tls,
}
}
}