author | Laszlo Peter <laszlo.peter@oracle.com> |
Wed, 07 Sep 2016 14:48:41 -0700 | |
changeset 6849 | f9a2279efa0d |
permissions | -rw-r--r-- |
6849
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
1 |
This patch fixes the zfssa_initator config logic around using the |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
2 |
default initiator group. The patch has been submitted upstream and this |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
3 |
file should be removed once Launchpad bug 1609517 is fixed. |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
4 |
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
5 |
--- cinder-8.0.0/cinder/volume/drivers/zfssa/zfssaiscsi.py.~1~ 2016-04-07 00:30:48.000000000 +0000 |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
6 |
+++ cinder-8.0.0/cinder/volume/drivers/zfssa/zfssaiscsi.py 2016-09-06 16:36:32.014258306 +0000 |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
7 |
@@ -174,13 +174,13 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
8 |
for initiator_group in initiator_config: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
9 |
zfssa_initiator_group = initiator_group |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
10 |
for zfssa_initiator in initiator_config[zfssa_initiator_group]: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
11 |
- self.zfssa.create_initiator(zfssa_initiator['iqn'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
12 |
- zfssa_initiator_group + '-' + |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
13 |
- zfssa_initiator['iqn'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
14 |
- chapuser= |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
15 |
- zfssa_initiator['user'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
16 |
- chapsecret= |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
17 |
- zfssa_initiator['password']) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
18 |
+ self.zfssa.create_initiator( |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
19 |
+ zfssa_initiator['iqn'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
20 |
+ zfssa_initiator_group + '-' + |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
21 |
+ zfssa_initiator['iqn'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
22 |
+ chapuser=zfssa_initiator['user'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
23 |
+ chapsecret=zfssa_initiator['password']) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
24 |
+ |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
25 |
if (zfssa_initiator_group != 'default'): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
26 |
self.zfssa.add_to_initiatorgroup( |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
27 |
zfssa_initiator['iqn'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
28 |
@@ -188,36 +188,37 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
29 |
else: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
30 |
LOG.warning(_LW('zfssa_initiator_config not found. ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
31 |
'Using deprecated configuration options.')) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
32 |
+ |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
33 |
+ if not lcfg.zfssa_initiator_group: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
34 |
+ LOG.error(_LE('zfssa_initiator_group cannot be empty. ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
35 |
+ 'Explicitly set the value "default" to use ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
36 |
+ 'the the default initiator group.')) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
37 |
+ raise exception.InvalidConfigurationValue( |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
38 |
+ value='', option='zfssa_initiator_group') |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
39 |
+ |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
40 |
if (not lcfg.zfssa_initiator and |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
41 |
- (not lcfg.zfssa_initiator_group and |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
42 |
- lcfg.zfssa_initiator_group != 'default')): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
43 |
+ lcfg.zfssa_initiator_group != 'default'): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
44 |
LOG.error(_LE('zfssa_initiator cannot be empty when ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
45 |
'creating a zfssa_initiator_group.')) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
46 |
raise exception.InvalidConfigurationValue( |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
47 |
- value='', |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
48 |
- option='zfssa_initiator') |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
49 |
- |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
50 |
- if (lcfg.zfssa_initiator != '' and |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
51 |
- (lcfg.zfssa_initiator_group == '' or |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
52 |
- lcfg.zfssa_initiator_group == 'default')): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
53 |
- LOG.warning(_LW('zfssa_initiator: %(ini)s' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
54 |
- ' wont be used on ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
55 |
- 'zfssa_initiator_group= %(inigrp)s.'), |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
56 |
- {'ini': lcfg.zfssa_initiator, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
57 |
- 'inigrp': lcfg.zfssa_initiator_group}) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
58 |
+ value='', option='zfssa_initiator') |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
59 |
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
60 |
- # Setup initiator and initiator group |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
61 |
- if (lcfg.zfssa_initiator != '' and |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
62 |
- lcfg.zfssa_initiator_group != '' and |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
63 |
- lcfg.zfssa_initiator_group != 'default'): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
64 |
- for initiator in lcfg.zfssa_initiator.split(','): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
65 |
- initiator = initiator.strip() |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
66 |
- self.zfssa.create_initiator( |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
67 |
- initiator, lcfg.zfssa_initiator_group + '-' + |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
68 |
- initiator, chapuser=lcfg.zfssa_initiator_user, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
69 |
- chapsecret=lcfg.zfssa_initiator_password) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
70 |
- self.zfssa.add_to_initiatorgroup( |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
71 |
- initiator, lcfg.zfssa_initiator_group) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
72 |
+ if lcfg.zfssa_initiator != '': |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
73 |
+ if lcfg.zfssa_initiator_group == 'default': |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
74 |
+ LOG.warning(_LW('zfssa_initiator: %(ini)s wont be used ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
75 |
+ 'on the default initiator group.'), |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
76 |
+ {'ini': lcfg.zfssa_initiator}) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
77 |
+ |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
78 |
+ # Setup initiator and initiator group |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
79 |
+ else: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
80 |
+ for initiator in lcfg.zfssa_initiator.split(','): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
81 |
+ initiator = initiator.strip() |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
82 |
+ self.zfssa.create_initiator( |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
83 |
+ initiator, lcfg.zfssa_initiator_group + '-' + |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
84 |
+ initiator, chapuser=lcfg.zfssa_initiator_user, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
85 |
+ chapsecret=lcfg.zfssa_initiator_password) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
86 |
+ self.zfssa.add_to_initiatorgroup( |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
87 |
+ initiator, lcfg.zfssa_initiator_group) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
88 |
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
89 |
# Parse interfaces |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
90 |
interfaces = [] |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
91 |
@@ -236,8 +237,8 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
92 |
self.zfssa.add_to_targetgroup(iqn, lcfg.zfssa_target_group) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
93 |
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
94 |
if lcfg.zfssa_manage_policy not in ("loose", "strict"): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
95 |
- err_msg = (_("zfssa_manage_policy property needs to be set to" |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
96 |
- " 'strict' or 'loose'. Current value is: %s.") % |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
97 |
+ err_msg = (_("zfssa_manage_policy property needs to be set to " |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
98 |
+ "'strict' or 'loose'. Current value is: %s.") % |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
99 |
lcfg.zfssa_manage_policy) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
100 |
LOG.error(err_msg) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
101 |
raise exception.InvalidInput(reason=err_msg) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
102 |
@@ -394,7 +395,7 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
103 |
if not self._verify_clone_size(snapshot, volume['size'] * units.Gi): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
104 |
exception_msg = (_('Error verifying clone size on ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
105 |
'Volume clone: %(clone)s ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
106 |
- 'Size: %(size)d on' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
107 |
+ 'Size: %(size)d on ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
108 |
'Snapshot: %(snapshot)s') |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
109 |
% {'clone': volume['name'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
110 |
'size': volume['size'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
111 |
@@ -489,8 +490,8 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
112 |
try: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
113 |
self.create_volume_from_snapshot(volume, zfssa_snapshot) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
114 |
except exception.VolumeBackendAPIException: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
115 |
- LOG.error(_LE('Clone Volume:' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
116 |
- '%(volume)s failed from source volume:' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
117 |
+ LOG.error(_LE('Clone Volume: ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
118 |
+ '%(volume)s failed from source volume: ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
119 |
'%(src_vref)s'), |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
120 |
{'volume': volume['name'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
121 |
'src_vref': src_vref['name']}) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
122 |
@@ -596,7 +597,7 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
123 |
cachevol_props.update(cachevol_meta) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
124 |
cache_vol, cache_snap = None, None |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
125 |
updated_at = six.text_type(img_meta['updated_at'].isoformat()) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
126 |
- LOG.debug('Verifying cache volume %s:', cachevol_name) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
127 |
+ LOG.debug('Verifying cache volume: %s', cachevol_name) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
128 |
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
129 |
try: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
130 |
cache_vol = self.zfssa.get_lun(lcfg.zfssa_pool, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
131 |
@@ -621,7 +622,7 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
132 |
specs, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
133 |
cachevol_props) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
134 |
except exception.SnapshotNotFound: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
135 |
- exception_msg = (_('Cache volume %(cache_vol)s' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
136 |
+ exception_msg = (_('Cache volume %(cache_vol)s ' |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
137 |
'does not have snapshot %(cache_snap)s.'), |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
138 |
{'cache_vol': cachevol_name, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
139 |
'cache_snap': cachesnap_name}) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
140 |
@@ -929,7 +930,8 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
141 |
'tgt_zfssa': self.tgt_zfssa, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
142 |
'tgt_pool': tgt_pool, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
143 |
'tgt_project': tgt_project, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
144 |
- 'volume': volume, 'tgt_asn': tgt_asn, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
145 |
+ 'volume': volume, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
146 |
+ 'tgt_asn': tgt_asn, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
147 |
'src_zfssa': self.zfssa, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
148 |
'src_asn': src_asn, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
149 |
'src_pool': src_pool, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
150 |
@@ -1011,7 +1013,7 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
151 |
lcfg.zfssa_cache_project, |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
152 |
cache['share']) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
153 |
except exception.VolumeBackendAPIException: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
154 |
- LOG.warning(_LW("Volume %s exists but can't be deleted"), |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
155 |
+ LOG.warning(_LW("Volume %s exists but can't be deleted."), |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
156 |
cache['share']) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
157 |
|
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
158 |
def manage_existing(self, volume, existing_ref): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
159 |
@@ -1063,8 +1065,8 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
160 |
schema={"custom:cinder_managed": False}) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
161 |
except exception.VolumeBackendAPIException: |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
162 |
with excutils.save_and_reraise_exception(): |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
163 |
- LOG.error(_LE("Failed to rename volume %(existing)s to" |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
164 |
- " %(new)s. Volume unmanage failed."), |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
165 |
+ LOG.error(_LE("Failed to rename volume %(existing)s to " |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
166 |
+ "%(new)s. Volume unmanage failed."), |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
167 |
{'existing': volume['name'], |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
168 |
'new': new_name}) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
169 |
return None |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
170 |
@@ -1080,8 +1082,8 @@ class ZFSSAISCSIDriver(driver.ISCSIDrive |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
171 |
err_msg = (_("Unknown if the volume: %s to be managed is " |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
172 |
"already being managed by Cinder. Aborting manage " |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
173 |
"volume. Please add 'cinder_managed' custom schema " |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
174 |
- "property to the volume and set its value to False." |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
175 |
- " Alternatively, set the value of cinder config " |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
176 |
+ "property to the volume and set its value to False. " |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
177 |
+ "Alternatively, set the value of cinder config " |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
178 |
"policy 'zfssa_manage_policy' to 'loose' to " |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
179 |
"remove this restriction.") % vol_name) |
f9a2279efa0d
24465600 Update Cinder for the Mitaka release
Laszlo Peter <laszlo.peter@oracle.com>
parents:
diff
changeset
|
180 |
LOG.error(err_msg) |