# HG changeset patch
# User Andrew Balfour <Andrew.Balfour@Oracle.COM>
# Date 1459552581 25200
# Node ID b67d827041c5b3f3ed099b2e8a2ec20fba7c7e55
# Parent  42ebc732084b67c2104bcaaf1e65f09422440b1d
23040216 extra zfssa_ prefix in the zfssa_iscsi.pp backend manifest

diff -r 42ebc732084b -r b67d827041c5 components/ruby/puppet-modules/openstack-cinder/files/backend/zfssa_iscsi.pp
--- a/components/ruby/puppet-modules/openstack-cinder/files/backend/zfssa_iscsi.pp	Fri Apr 01 16:02:33 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-cinder/files/backend/zfssa_iscsi.pp	Fri Apr 01 16:16:21 2016 -0700
@@ -8,8 +8,8 @@
 #    (optional) Allows for the volume_backend_name to be separate of $name.
 #    Defaults to: $name
 #
-# [*ip*]
-#   (required) IP address of ZFS Storage Appliance.
+# [*hostname*]
+#   (required) Hostname of ZFS Storage Appliance.
 #
 # [*login*]
 #   (required) Username to login to ZFS Storage Appliance.
@@ -108,7 +108,7 @@
     "${name}/volume_driver":           value => 'cinder.volume.drivers.zfssa.zfssaiscsi.ZFSSAISCSIDriver';
     "${name}/san_ip":                  value => $hostname;
     "${name}/san_login":               value => $login;
-    "${name}/san_password":            value => $zfssa_password, secret => true;
+    "${name}/san_password":            value => $password, secret => true;
     "${name}/zfssa_pool":              value => $zfssa_pool;
     "${name}/zfssa_project":           value => $zfssa_project;
     "${name}/zfssa_target_portal":     value => $zfssa_target_portal;
diff -r 42ebc732084b -r b67d827041c5 components/ruby/puppet-modules/openstack-cinder/files/volume/zfssa_iscsi.pp
--- a/components/ruby/puppet-modules/openstack-cinder/files/volume/zfssa_iscsi.pp	Fri Apr 01 16:02:33 2016 -0700
+++ b/components/ruby/puppet-modules/openstack-cinder/files/volume/zfssa_iscsi.pp	Fri Apr 01 16:16:21 2016 -0700
@@ -4,8 +4,8 @@
 #
 # === Parameters
 #
-# [*ip*]
-#   (required) IP address of ZFS Storage Appliance.
+# [*hostname*]
+#   (required) Hostname of ZFS Storage Appliance.
 #
 # [*login*]
 #   (required) Username to login to ZFS Storage Appliance.