1 This patch addresses 22554075 which has also been filed in Launchpad

     2 under 1538582.

     3 

     4 --- cinder-2015.1.2/cinder/volume/drivers/zfssa/zfssaiscsi.py.~2~	2016-01-31 17:10:27.739412163 -0800

     5 +++ cinder-2015.1.2/cinder/volume/drivers/zfssa/zfssaiscsi.py	2016-01-31 17:11:03.123083242 -0800

     6 @@ -1,4 +1,4 @@

     7 -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.

     8 +# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.

     9  #

    10  #    Licensed under the Apache License, Version 2.0 (the "License"); you may

    11  #    not use this file except in compliance with the License. You may obtain

    12 @@ -415,7 +415,7 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive

    13          iscsi_properties['target_discovered'] = False

    14          iscsi_properties['target_portal'] = target_portal

    15          iscsi_properties['target_iqn'] = iqn

    16 -        iscsi_properties['target_lun'] = lun

    17 +        iscsi_properties['target_lun'] = int(lun)

    18          iscsi_properties['volume_id'] = volume['id']

    19  

    20          if 'provider_auth' in provider: