summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-05-25 09:00:13 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-05-25 09:00:13 -0700
commitf6f98f1fe905443eacbfb036f1b6ff6c6f5d5261 (patch)
treee57653acdab1171ce2f6a4d24926ad73783d6667
parent9d842298d9e771b7b25ecd94c3e2437c65d00beb (diff)
downloadnova-f6f98f1fe905443eacbfb036f1b6ff6c6f5d5261.tar.gz
nova-f6f98f1fe905443eacbfb036f1b6ff6c6f5d5261.tar.xz
nova-f6f98f1fe905443eacbfb036f1b6ff6c6f5d5261.zip
dist-sched-2a merge
-rw-r--r--nova/api/openstack/zones.py3
1 files changed, 0 insertions, 3 deletions
diff --git a/nova/api/openstack/zones.py b/nova/api/openstack/zones.py
index 78715f1cc..29b7b2279 100644
--- a/nova/api/openstack/zones.py
+++ b/nova/api/openstack/zones.py
@@ -26,9 +26,6 @@ from nova.scheduler import api
FLAGS = flags.FLAGS
-flags.DEFINE_string('build_plan_encryption_key',
- None,
- '128bit (hex) encryption key for scheduler build plans.')
LOG = logging.getLogger('nova.api.openstack.zones')