Merge lp://qastaging/~zulcss/nova/nova-iscsi-choice into lp://qastaging/~hudson-openstack/nova/trunk

19 + self.volume.driver._execute("sudo", "%s" %FLAGS.iscsi_helper, "--op", "show",

This and there are a number of other PEP8 violations to fix.

169 + if FLAGS.iscsi_helper == 'tgtadm':
170 + mount_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-0" %
171 + (iscsi_properties['target_portal'],
172 + iscsi_properties['target_iqn']))
173 + else:
174 + mount_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-0" %
175 + (iscsi_properties['target_portal'],
176 + iscsi_properties['target_iqn']))

I don't think we need this if statement? Unless I'm missing something it's the same code. If you'd like you can put a note in the code indicating that the two supported iscsi implementations share the same strategy here but I'm not sure even that is necessary.

How are you currently testing this code? Manually? Have you tested both ietadm and tgtadm? I get very uneasy around code that's not only not tested, but isn't really testable.

Also, can you delete your other branch if this is the way you're going to proceed? Thanks!

needs fixing - please write tests for the new feature; In addition, are there tests for the old feature?

More work on this at lp:~markmc/nova/iscsi-tgtadm-choice - I believe I've handled Ben and Brian's comments