From da3afc69160eb37a5e100f346b29f00ff4d072f6 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Tue, 6 Nov 2012 18:03:36 -0800 Subject: [PATCH] Bad removal --- anvil/components/glance.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/anvil/components/glance.py b/anvil/components/glance.py index 467d71e9..8f2c8f21 100644 --- a/anvil/components/glance.py +++ b/anvil/components/glance.py @@ -247,7 +247,8 @@ class GlanceRuntime(comp.PythonRuntime): params['glance'] = ghelper.get_shared_params(**self.options) params['keystone'] = khelper.get_shared_params(ip=self.get_option('ip'), service_user='glance', - **utils.merge_dicts(self.get_option('keystone'))) + **utils.merge_dicts(self.get_option('keystone'), + khelper.get_shared_passwords(self))) cache_dir = self.get_option('image_cache_dir') if cache_dir: params['cache_dir'] = cache_dir