From e00408b015596f6670d5afe639a28cb5a942d58d Mon Sep 17 00:00:00 2001
From: Mike Pittaro <mikeyp@LaHondaResearch.org>
Date: Fri, 3 Feb 2012 15:46:01 -0800
Subject: [PATCH] Fix bug 921814 changes handling of adminPass in API.

Add a new nova configuration flag, boolean, enable_instance_password.

When the flag is True (default), existing behavior is unchanged.

When the flag is False, responses from the create or
rebuild API calls don't include the adminPass attribute.

Change-Id: Icb2bd703770f3a39bb1e458dc31e1489d48da7c1
---
 Authors       | 1 +
 nova/flags.py | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/Authors b/Authors
index 815bbe7c..afcc2bd7 100644
--- a/Authors
+++ b/Authors
@@ -115,6 +115,7 @@ Matthew Hooker <matt@cloudscaling.com>
 Michael Gundlach <michael.gundlach@rackspace.com>
 Michael Still <mikal@stillhq.com>
 Mike Lundy <mike@pistoncloud.com>
+Mike Pittaro <mikeyp@lahondaresearch.org>
 Mike Scherbakov <mihgen@gmail.com>
 Mikyung Kang <mkkang@isi.edu>
 Mohammed Naser <mnaser@vexxhost.com>
diff --git a/nova/flags.py b/nova/flags.py
index 3f356005..3fac3a2d 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -503,6 +503,10 @@ global_opts = [
     cfg.BoolOpt('use_ipv6',
                 default=False,
                 help='use ipv6'),
+    cfg.BoolOpt('enable_instance_password',
+                default=True,
+                help='Allows use of instance password during '
+                       'server creation'),
     cfg.IntOpt('password_length',
                default=12,
                help='Length of generated instance admin passwords'),