openstack/puppet-cinder
Code Issues Proposed changes

SAN driver: Support san_api_port

Browse Source 
Change-Id: Ib904c215a12f46ac02a90a93d997c524e689e140
This commit is contained in:
Takashi Kajinami 2022-04-01 23:12:34 +09:00
parent a021077d0e
commit 2f7d3d51f8
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/backend/san.pp
View File

@ -46,6 +46,10 @@
# (optional) SSH port to use with SAN. # (optional) SSH port to use with SAN.
# Defaults to $::os_service_default. # Defaults to $::os_service_default.
# #
# [*san_api_port*]
# (optional) Port to use to access the SAN API.
# Defaults to $::os_service_default.
#
# [*san_is_local*] # [*san_is_local*]
# (optional) Execute commands locally instead of over SSH # (optional) Execute commands locally instead of over SSH
# use if the volume service is running on the SAN device. # use if the volume service is running on the SAN device.
@ -86,6 +90,7 @@ define cinder::backend::san (
$san_private_key = $::os_service_default, $san_private_key = $::os_service_default,
$san_clustername = $::os_service_default, $san_clustername = $::os_service_default,
$san_ssh_port = $::os_service_default, $san_ssh_port = $::os_service_default,
$san_api_port = $::os_service_default,
$san_is_local = $::os_service_default, $san_is_local = $::os_service_default,
$ssh_conn_timeout = $::os_service_default, $ssh_conn_timeout = $::os_service_default,
$ssh_min_pool_conn = $::os_service_default, $ssh_min_pool_conn = $::os_service_default,
@ -107,6 +112,7 @@ define cinder::backend::san (
"${name}/san_private_key": value => $san_private_key; "${name}/san_private_key": value => $san_private_key;
"${name}/san_clustername": value => $san_clustername; "${name}/san_clustername": value => $san_clustername;
"${name}/san_ssh_port": value => $san_ssh_port; "${name}/san_ssh_port": value => $san_ssh_port;
"${name}/san_api_port": value => $san_api_port;
"${name}/san_is_local": value => $san_is_local; "${name}/san_is_local": value => $san_is_local;
"${name}/ssh_conn_timeout": value => $ssh_conn_timeout; "${name}/ssh_conn_timeout": value => $ssh_conn_timeout;
"${name}/ssh_min_pool_conn": value => $ssh_min_pool_conn; "${name}/ssh_min_pool_conn": value => $ssh_min_pool_conn;

5
releasenotes/notes/san_api_port-8aa8ee7690bd5632.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The ``cinder::backend::san`` defined type now supports the ``san_api_port``
parameter.

2
spec/defines/cinder_backend_san_spec.rb
View File

@ -19,6 +19,7 @@ describe 'cinder::backend::san' do
:san_private_key => '<SERVICE DEFAULT>', :san_private_key => '<SERVICE DEFAULT>',
:san_clustername => '<SERVICE DEFAULT>', :san_clustername => '<SERVICE DEFAULT>',
:san_ssh_port => '<SERVICE DEFAULT>', :san_ssh_port => '<SERVICE DEFAULT>',
:san_api_port => '<SERVICE DEFAULT>',
:san_is_local => '<SERVICE DEFAULT>', :san_is_local => '<SERVICE DEFAULT>',
:ssh_conn_timeout => '<SERVICE DEFAULT>', :ssh_conn_timeout => '<SERVICE DEFAULT>',
:ssh_min_pool_conn => '<SERVICE DEFAULT>', :ssh_min_pool_conn => '<SERVICE DEFAULT>',
@ -55,6 +56,7 @@ describe 'cinder::backend::san' do
:san_password => 'secret', :san_password => 'secret',
:san_clustername => 'storage_cluster', :san_clustername => 'storage_cluster',
:san_ssh_port => 22, :san_ssh_port => 22,
:san_api_port => 8080,
:san_is_local => false, :san_is_local => false,
:ssh_conn_timeout => 30, :ssh_conn_timeout => 30,
:ssh_min_pool_conn => 1, :ssh_min_pool_conn => 1,