Merge "Fix bug 921814 changes handling of adminPass in API."

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>

nova/flags.py

@@ -494,6 +494,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'),