From 229221ec9780112981aedfc8849272aa49a9b25b Mon Sep 17 00:00:00 2001 From: Mike Pittaro Date: Fri, 3 Feb 2012 15:46:01 -0800 Subject: 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 --- nova/api/openstack/compute/servers.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'nova/api') diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 8f9ee01df..57adf22ae 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -784,7 +784,8 @@ class Controller(wsgi.Controller): if '_is_precooked' in server['server'].keys(): del server['server']['_is_precooked'] else: - server['server']['adminPass'] = password + if FLAGS.enable_instance_password: + server['server']['adminPass'] = password robj = wsgi.ResponseObject(server) @@ -1107,7 +1108,9 @@ class Controller(wsgi.Controller): view = self._view_builder.show(req, instance) # Add on the adminPass attribute since the view doesn't do it - view['server']['adminPass'] = password + # unless instance passwords are disabled + if FLAGS.enable_instance_password: + view['server']['adminPass'] = password robj = wsgi.ResponseObject(view) return self._add_location(robj) -- cgit