diff options
| author |   Steven Pisarski <s.pisarski@cablelabs.com> | 2017-12-01 14:14:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-01 14:14:17 +0000 |
| commit | d62e9aa865c689c44e32da2557cda8f8060ce16f (patch) | |
| tree | 18308eb6b6f4cfffa3b921616c11015a2e54875b /snaps/openstack/utils/settings_utils.py | |
| parent | 91d2fd9f9249126b135040b7f86387f887a414b3 (diff) | |
| parent | 7e93244ce1b4e8aa40dba7c43ace466a02b7f666 (diff) | |
Merge "Deactivated test heat template's volume encryption."
Diffstat (limited to 'snaps/openstack/utils/settings_utils.py')
| -rw-r--r-- | snaps/openstack/utils/settings_utils.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/snaps/openstack/utils/settings_utils.py b/snaps/openstack/utils/settings_utils.py index 145b481..d1a9cc6 100644 --- a/snaps/openstack/utils/settings_utils.py +++ b/snaps/openstack/utils/settings_utils.py @@ -173,12 +173,15 @@ def create_volume_type_config(volume_type): else: control = ControlLocation.back_end - encrypt_settings = VolumeTypeEncryptionConfig( - name=volume_type.encryption.__class__, - provider_class=volume_type.encryption.provider, - control_location=control, - cipher=volume_type.encryption.cipher, - key_size=volume_type.encryption.key_size) + if volume_type and volume_type.encryption: + encrypt_settings = VolumeTypeEncryptionConfig( + name=volume_type.encryption.__class__, + provider_class=volume_type.encryption.provider, + control_location=control, + cipher=volume_type.encryption.cipher, + key_size=volume_type.encryption.key_size) + else: + encrypt_settings = None qos_spec_name = None if volume_type.qos_spec: |