openstack/puppet-cinder
Code Issues Proposed changes

Eqlx: Added support for password less login

Browse Source 
Added missing san_private_key paraeter used for password less SSH
authentication for Eqlx Cinder Backend.

Change-Id: I76072131dceeadfcad5b344df9af123ab3988166
This commit is contained in:
rajinir 2017-06-26 13:08:58 -05:00
parent 83753f1b2d
commit 3639bedd1a
5 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/backend/eqlx.pp
View File

@ -13,6 +13,10 @@
# [*san_password*] # [*san_password*]
# (required) The password for the specified SSH account. # (required) The password for the specified SSH account.
# #
# [*san_private_key*]
# (optional) Filename of private key to use for SSH authentication.
# Defaults to $::os_service_default
#
# [*san_thin_provision*] # [*san_thin_provision*]
# (optional) Boolean. Whether or not to use thin provisioning for volumes. The # (optional) Boolean. Whether or not to use thin provisioning for volumes. The
# default value in OpenStack is true. # default value in OpenStack is true.
@ -65,6 +69,7 @@ define cinder::backend::eqlx (
$san_ip, $san_ip,
$san_login, $san_login,
$san_password, $san_password,
$san_private_key = $::os_service_default,
$san_thin_provision = $::os_service_default, $san_thin_provision = $::os_service_default,
$volume_backend_name = $name, $volume_backend_name = $name,
$eqlx_group_name = $::os_service_default, $eqlx_group_name = $::os_service_default,
@ -94,6 +99,7 @@ define cinder::backend::eqlx (
"${name}/san_ip": value => $san_ip; "${name}/san_ip": value => $san_ip;
"${name}/san_login": value => $san_login; "${name}/san_login": value => $san_login;
"${name}/san_password": value => $san_password, secret => true; "${name}/san_password": value => $san_password, secret => true;
"${name}/san_private_key": value => $san_private_key;
"${name}/san_thin_provision": value => $san_thin_provision; "${name}/san_thin_provision": value => $san_thin_provision;
"${name}/eqlx_group_name": value => $eqlx_group_name; "${name}/eqlx_group_name": value => $eqlx_group_name;
"${name}/use_chap_auth": value => $use_chap_auth; "${name}/use_chap_auth": value => $use_chap_auth;

6
manifests/volume/eqlx.pp
View File

@ -13,6 +13,10 @@
# [*san_password*] # [*san_password*]
# (required) The password for the specified SSH account. # (required) The password for the specified SSH account.
# #
# [*san_private_key*]
# (optional) Filename of private key to use for SSH authentication.
# Defaults to $::os_service_default
#
# [*san_thin_provision*] # [*san_thin_provision*]
# (optional) Whether or not to use thin provisioning for volumes. # (optional) Whether or not to use thin provisioning for volumes.
# Defaults to $::os_service_default # Defaults to $::os_service_default
@ -72,6 +76,7 @@ class cinder::volume::eqlx (
$san_ip, $san_ip,
$san_login, $san_login,
$san_password, $san_password,
$san_private_key = $::os_service_default,
$san_thin_provision = $::os_service_default, $san_thin_provision = $::os_service_default,
$eqlx_group_name = $::os_service_default, $eqlx_group_name = $::os_service_default,
$eqlx_pool = $::os_service_default, $eqlx_pool = $::os_service_default,
@ -133,6 +138,7 @@ cinder::backend::eqlx instead.')
san_ip => $san_ip, san_ip => $san_ip,
san_login => $san_login, san_login => $san_login,
san_password => $san_password, san_password => $san_password,
san_private_key => $san_private_key,
san_thin_provision => $san_thin_provision, san_thin_provision => $san_thin_provision,
eqlx_group_name => $eqlx_group_name, eqlx_group_name => $eqlx_group_name,
eqlx_pool => $eqlx_pool, eqlx_pool => $eqlx_pool,

4
releasenotes/notes/eqlx-c76440e19622a1e4.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- add new parameter san_private_key to configure SSH Private Key
for Eqlx Cinder Backend

1
spec/classes/cinder_volume_eqlx_spec.rb
View File

@ -6,6 +6,7 @@ describe 'cinder::volume::eqlx' do
:san_ip => '192.168.100.10', :san_ip => '192.168.100.10',
:san_login => 'grpadmin', :san_login => 'grpadmin',
:san_password => '12345', :san_password => '12345',
:san_private_key => '',
:san_thin_provision => true, :san_thin_provision => true,
:eqlx_group_name => 'group-a', :eqlx_group_name => 'group-a',
:eqlx_pool => 'apool', :eqlx_pool => 'apool',

1
spec/defines/cinder_backend_eqlx_spec.rb
View File

@ -10,6 +10,7 @@ describe 'cinder::backend::eqlx' do
:san_ip => '192.168.100.10', :san_ip => '192.168.100.10',
:san_login => 'grpadmin', :san_login => 'grpadmin',
:san_password => '12345', :san_password => '12345',
:san_private_key => '',
:volume_backend_name => 'Dell_EQLX', :volume_backend_name => 'Dell_EQLX',
:san_thin_provision => '<SERVICE DEFAULT>', :san_thin_provision => '<SERVICE DEFAULT>',
:eqlx_group_name => '<SERVICE DEFAULT>', :eqlx_group_name => '<SERVICE DEFAULT>',