x/cloudbase-init
Code Issues Proposed changes

Check for admin_pass in "meta"

Browse Source
This commit is contained in:
Alessandro Pilotti 2013-06-16 14:26:22 +03:00
parent 899e4f1d4e
commit 66d42cffbd
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloudbaseinit/plugins/windows/createuser.py
View File

@ -39,10 +39,12 @@ LOG = logging.getLogger(__name__)
class CreateUserPlugin(base.BasePlugin):
def _get_password(self, service, osutils):
meta_data = service.get_meta_data('openstack')
if 'admin_pass' in meta_data and CONF.inject_user_password:
meta = meta_data.get('meta')
if CONF.inject_user_password and meta and 'admin_pass' in meta:
LOG.warn('Using admin_pass metadata user password. Consider '
'changing it as soon as possible')
password = meta_data['admin_pass']
password = meta['admin_pass']
else:
# Generate a temporary random password to be replaced
# by SetUserPasswordPlugin (starting from Grizzly)