x/cloudbase-init
Code Issues Proposed changes

Merge pull request #29 from mgagne/configdrive_admin_pass

Browse Source 
Support admin_pass field for admin password
This commit is contained in:
Alessandro Pilotti 2013-12-02 11:10:28 -08:00
commit 3646a1e942
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cloudbaseinit/plugins/windows/setuserpassword.py
View File

@ -61,11 +61,17 @@ class SetUserPasswordPlugin(base.BasePlugin):
def _get_password(self, service, osutils):
meta_data = service.get_meta_data('openstack')
meta = meta_data.get('meta')
password = None
if CONF.inject_user_password and meta and 'admin_pass' in meta:
if CONF.inject_user_password:
if meta and 'admin_pass' in meta:
password = meta['admin_pass']
elif 'admin_pass' in meta_data:
password = meta_data['admin_pass']
if password:
LOG.warn('Using admin_pass metadata user password. Consider '
'changing it as soon as possible')
password = meta['admin_pass']
else:
LOG.debug('Generating a random user password')
# Generate a random password