Merge "Hitachi: Fix to use correct pool on secondary storage"

cinder/volume/drivers/hitachi/hbsd_replication.py

@@ -237,7 +237,15 @@ class HBSDREPLICATION(rest.HBSDREST):
         for opt in opts:
             name = opt.name.replace('hitachi_mirror_', 'hitachi_')
             try:
-                setattr(conf, name, getattr(conf, opt.name))
+                if opt.name == 'hitachi_mirror_pool':
+                    if conf.safe_get('hitachi_mirror_pool'):
+                        name = 'hitachi_pools'
+                        value = [getattr(conf, opt.name)]
+                    else:
+                        raise ValueError()
+                else:
+                    value = getattr(conf, opt.name)
+                setattr(conf, name, value)
             except Exception:
                 with excutils.save_and_reraise_exception():
                     self.rep_secondary.output_log(

releasenotes/notes/hitachi-vsp-fix-to-use-correct-pool-in-GAD-9413a343dcc98029.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Hitachi driver `bug #2011810
+    <https://bugs.launchpad.net/cinder/+bug/2011810>`_: Fixed to use
+    correct pool number for secondary storage on GAD environment.