Cinder migration 017_add_encryption_information adds two new volume types without warning

[Michael Kerrin]

After deploying a recent version of cinder to a test system it was noticed that the cinder migration created two new volume types without warning. It shouldn't have done that.

$ cinder type-list
+--------------------------------------+----------+
| ID | Name |
+--------------------------------------+----------+
| cdc8ac25-4d65-4488-911a-3a9b0c479bf7 | LUKS |
| d1fb688c-cf6a-4b0c-82e0-224d1ad60122 | dm-crypt |
+--------------------------------------+----------+

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/43482

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/43482
Committed: http://github.com/openstack/cinder/commit/921ce48fb12fdeb71b10cb411ff9aca9abae03d7
Submitter: Jenkins
Branch: master

commit 921ce48fb12fdeb71b10cb411ff9aca9abae03d7
Author: Michael Kerrin <email address hidden>
Date: Fri Aug 23 14:42:46 2013 +0000

    The DB migration shouldn't populate types table

    It is up to the system adminisator to do this via an API call.

    Also fixes up a few cases of dict() being used rather than the prefered {}
    (https://github.com/openstack-dev/hacking/blob/master/HACKING.rst#dictionarieslists)

    Fixes bug: 1215962

    Change-Id: I6b2eea0c03467b157ec147292dbea54e7f99006c