Merge "Ps Cinder: Added support for password less login"

diff --git a/environments/cinder-dellps-config.yaml b/environments/cinder-dellps-config.yaml
index eefd0fd..f5adbaf 100644 (file)
--- a/environments/cinder-dellps-config.yaml
+++ b/environments/cinder-dellps-config.yaml
@@ -23,6 +23,7 @@ parameter_defaults:
   CinderDellPsSanIp: ''
   CinderDellPsSanLogin: ''
   CinderDellPsSanPassword: ''
+  CinderDellPsSanPrivateKey: ''
   CinderDellPsSanThinProvision: true
   CinderDellPsGroupname: 'group-0'
   CinderDellPsPool: 'default'

diff --git a/puppet/services/cinder-backend-dellps.yaml b/puppet/services/cinder-backend-dellps.yaml
index caa2f2f..388e49b 100644 (file)
--- a/puppet/services/cinder-backend-dellps.yaml
+++ b/puppet/services/cinder-backend-dellps.yaml
@@ -31,6 +31,9 @@ parameters:
   CinderDellPsSanPassword:
     type: string
     hidden: true
+  CinderDellPsSanPrivateKey:
+    type: string
+    default: ''
   CinderDellPsSanThinProvision:
     type: boolean
     default: true
@@ -87,6 +90,7 @@ outputs:
         cinder::backend::eqlx::san_ip: {get_param: CinderDellPsSanIp}
         cinder::backend::eqlx::san_login: {get_param: CinderDellPsSanLogin}
         cinder::backend::eqlx::san_password: {get_param: CinderDellPsSanPassword}
+        cinder::backend::eqlx::san_private_key: {get_param: CinderDellPsSanPrivateKey}
         cinder::backend::eqlx::san_thin_provision: {get_param: CinderDellPsSanThinProvision}
         cinder::backend::eqlx::eqlx_group_name: {get_param: CinderDellPsGroupname}
         cinder::backend::eqlx::eqlx_pool: {get_param: CinderDellPsPool}

diff --git a/releasenotes/notes/ps-san_private_key-5aa111e7907ba600.yaml b/releasenotes/notes/ps-san_private_key-5aa111e7907ba600.yaml
new file mode 100644 (file)
index 0000000..6359331
--- /dev/null
+++ b/releasenotes/notes/ps-san_private_key-5aa111e7907ba600.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - Added new parameter san_private_key to configure SSH Private Key
+    for the PS Series cinder backend