x/cloud-init
Code Issues Proposed changes

do not attempt the useradd command if user exists

Browse Source 
Previously we were only logging that the user existed
and then still trying to run the command (which would raise error)

As a result, none of the rest of the things would be done (sshimport id and
such)
This commit is contained in:
Scott Moser 2012-08-22 22:40:52 -04:00
parent 1b70b4e757
commit 25ff4c2c41
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cloudinit/distros/__init__.py
View File

@ -211,11 +211,6 @@ class Distro(object):
distros where useradd is not desirable or not available.
"""
if self.isuser(name):
LOG.warn("User %s already exists, skipping." % name)
else:
LOG.debug("Creating name %s" % name)
adduser_cmd = ['useradd', name]
x_adduser_cmd = ['useradd', name]
@ -263,11 +258,15 @@ class Distro(object):
adduser_cmd.append('-m')
# Create the user
try:
util.subp(adduser_cmd, logstring=x_adduser_cmd)
except Exception as e:
util.logexc(LOG, "Failed to create user %s due to error.", e)
raise e
if self.isuser(name):
LOG.warn("User %s already exists, skipping." % name)
else:
LOG.debug("Creating name %s" % name)
try:
util.subp(adduser_cmd, logstring=x_adduser_cmd)
except Exception as e:
util.logexc(LOG, "Failed to create user %s due to error.", e)
raise e
# Set password if plain-text password provided
if 'plain_text_passwd' in kwargs and kwargs['plain_text_passwd']: