From f0f46498098b87d436bfce99d0d1116539d046fa Mon Sep 17 00:00:00 2001
From: Brianna Poulos <Brianna.Poulos@jhuapl.edu>
Date: Fri, 30 Aug 2013 09:59:42 -0400
Subject: [PATCH] Remove encryption option for volumes

Change Idb6a923f (https://review.openstack.org/#/c/21264/) added an
encryption choice field for volumes.  However, this choice field uses
volume metadata rather than volume type to denote an encrypted volume.
This option is removed in this patch, since the existing volume type
field should be used instead.

Change-Id: I730b4ffc26f391065943cb0d135ceac113cb6754
Implements: blueprint volume-encryption-field
---
 openstack_dashboard/test/settings.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/openstack_dashboard/test/settings.py b/openstack_dashboard/test/settings.py
index cda2ea8d..efef3866 100644
--- a/openstack_dashboard/test/settings.py
+++ b/openstack_dashboard/test/settings.py
@@ -89,10 +89,6 @@ OPENSTACK_NEUTRON_NETWORK = {
 
 OPENSTACK_HYPERVISOR_FEATURES = {
     'can_set_mount_point': True,
-
-    # NOTE: as of Grizzly this is not yet supported in Nova so enabling this
-    # setting will not do anything useful
-    'can_encrypt_volumes': False
 }
 
 LOGGING['loggers']['openstack_dashboard'] = {