diff options
| author |   spisarski <s.pisarski@cablelabs.com> | 2017-11-30 14:35:53 -0700 |
|---|---|---|
| committer | spisarski <s.pisarski@cablelabs.com> | 2017-11-30 14:35:53 -0700 |
| commit | 7e93244ce1b4e8aa40dba7c43ace466a02b7f666 (patch) | |
| tree | a50623a41e9927349dcf140fd16117e79dcb8005 /snaps/openstack/utils/settings_utils.py | |
| parent | 43151f4e44e64b8436bed234f2dcb60dfc643687 (diff) | |
Deactivated test heat template's volume encryption.
Removed volume encryption from the test volume heat template as
it is no longer operating properly against a Pike pod. Created the
ticket SNAPS-245 to address this issue sometime in the future.
JIRA: SNAPS-240
Change-Id: I610dbba4ebadd5dfb360a665b7a543be6ef5fb1c
Signed-off-by: spisarski <s.pisarski@cablelabs.com>
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: |