Merge "remove Brick deps on cinder.exception"

diff --cc cinder/brick/iscsi/iscsi.py
index de22bb9ce228538566019890274883c681dfa4b5,5fb59b449ae2c853ba73c3af32c76f99c8629cd5..ec17e3181952232b12b083120ed315a8e9c45837
--- 1/cinder/brick/iscsi/iscsi.py
--- 2/cinder/brick/iscsi/iscsi.py
+++ b/cinder/brick/iscsi/iscsi.py
@@@ -426,10 -426,10 +426,10 @@@ class LioAdm(TargetAdmin)
                              name,
                              chap_auth_userid,
                              chap_auth_password]
 -            if extra_args != []:
 -                command_args += extra_args
 +            if extra_args:
 +                command_args.extend(extra_args)
              self._execute(*command_args, run_as_root=True)
-         except exception.ProcessExecutionError as e:
+         except putils.ProcessExecutionError as e:
                  LOG.error(_("Failed to create iscsi target for volume "
                              "id:%s.") % vol_id)
                  LOG.error("%s" % str(e))

diff --cc cinder/brick/local_dev/lvm.py
Simple merge